Skip to content

Explicit S3 key #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 1, 2017
Merged

Explicit S3 key #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c392dc6
Add logic for using explicit S3 key
jessewiles Sep 18, 2017
25035ae
Merge branch 'master' into s3-explicit-key
timvaillancourt Dec 1, 2017
1d7234d
Merge branch 'master' into s3-explicit-key
timvaillancourt Dec 1, 2017
ddfd83a
Update __init__.py
timvaillancourt Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions mongodb_consistent_backup/Upload/S3/S3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,20 @@ def _reduce_method(m):
class S3(Task):
def __init__(self, manager, config, timer, base_dir, backup_dir, **kwargs):
super(S3, self).__init__(self.__class__.__name__, manager, config, timer, base_dir, backup_dir, **kwargs)
self.remove_uploaded = self.config.upload.remove_uploaded
self.retries = self.config.upload.retries
self.thread_count = self.config.upload.threads
self.region = self.config.upload.s3.region
self.bucket_name = self.config.upload.s3.bucket_name
self.bucket_prefix = self.config.upload.s3.bucket_prefix
self.access_key = self.config.upload.s3.access_key
self.secret_key = self.config.upload.s3.secret_key
self.chunk_size_mb = self.config.upload.s3.chunk_size_mb
self.chunk_size = self.chunk_size_mb * 1024 * 1024
self.secure = self.config.upload.s3.secure
self.s3_acl = self.config.upload.s3.acl
self.key_prefix = base_dir
self.remove_uploaded = self.config.upload.remove_uploaded
self.retries = self.config.upload.retries
self.thread_count = self.config.upload.threads
self.region = self.config.upload.s3.region
self.bucket_name = self.config.upload.s3.bucket_name
self.bucket_prefix = self.config.upload.s3.bucket_prefix
self.bucket_explicit_key = self.config.upload.s3.bucket_explicit_key
self.access_key = self.config.upload.s3.access_key
self.secret_key = self.config.upload.s3.secret_key
self.chunk_size_mb = self.config.upload.s3.chunk_size_mb
self.chunk_size = self.chunk_size_mb * 1024 * 1024
self.secure = self.config.upload.s3.secure
self.s3_acl = self.config.upload.s3.acl
self.key_prefix = base_dir

self._pool = None
self._multipart = None
Expand All @@ -67,10 +68,13 @@ def run(self):
file_size = os.stat(file_path).st_size
chunk_count = int(ceil(file_size / float(self.chunk_size)))

if self.bucket_prefix == "/":
key_name = "/%s/%s" % (self.key_prefix, file_name)
if self.bucket_explicit_key:
key_name = self.bucket_explicit_key
else:
key_name = "%s/%s/%s" % (self.bucket_prefix, self.key_prefix, file_name)
if self.bucket_prefix == "/":
key_name = "/%s/%s" % (self.key_prefix, file_name)
else:
key_name = "%s/%s/%s" % (self.bucket_prefix, self.key_prefix, file_name)

logging.info("Starting multipart AWS S3 upload to key: %s%s using %i threads, %imb chunks, %i retries" % (
self.bucket_name,
Expand Down
2 changes: 2 additions & 0 deletions mongodb_consistent_backup/Upload/S3/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ def config(parser):
help="S3 Uploader destination bucket name")
parser.add_argument("--upload.s3.bucket_prefix", dest="upload.s3.bucket_prefix", type=str,
help="S3 Uploader destination bucket path prefix")
parser.add_argument("--upload.s3.bucket_explicit_key", dest="upload.s3.bucket_explicit_key", type=str,
help="S3 Uploader explicit storage key within the S3 bucket")
parser.add_argument("--upload.s3.chunk_size_mb", dest="upload.s3.chunk_size_mb", default=50, type=int,
help="S3 Uploader upload chunk size, in megabytes (default: 50)")
parser.add_argument("--upload.s3.secure", dest="upload.s3.secure", default=True, action="store_false",
Expand Down