Explicitly uploading mongo backups

This commit is contained in:
Samuel Clay 2022-02-03 16:37:15 -05:00
parent 43e61cc5aa
commit ed08c035cc
2 changed files with 12 additions and 13 deletions

View file

@ -214,15 +214,15 @@
tags: tags:
- mongo-backup - mongo-backup
- name: Add mongo starred_stories+stories backup # - name: Add mongo starred_stories+stories backup
cron: # cron:
name: mongo starred/shared/all stories backup # name: mongo starred/shared/all stories backup
minute: "0" # minute: "0"
hour: "5" # hour: "5"
job: /srv/newsblur/docker/mongo/backup_mongo.sh stories # job: /srv/newsblur/docker/mongo/backup_mongo.sh stories
when: '"db-mongo-secondary1" in inventory_hostname' # when: '"db-mongo-secondary1" in inventory_hostname'
tags: # tags:
- mongo-backup # - mongo-backup
# Renaming a db-mongo3 to db-mongo2: # Renaming a db-mongo3 to db-mongo2:
# - Change hostname to db-mongo2 on Digital Ocean (doctl) # - Change hostname to db-mongo2 on Digital Ocean (doctl)

View file

@ -20,8 +20,7 @@ def main():
for filename in filenames: for filename in filenames:
file_path = os.path.join(BACKUP_DIR, filename) file_path = os.path.join(BACKUP_DIR, filename)
basename = os.path.basename(file_path) basename = os.path.basename(file_path)
key_base, key_ext = list(splitext(basename)) key_prefix = 'backup_db_mongo/'
key_prefix = "".join(['backup_db_mongo/', key_base])
print("Uploading {0} to {1} on {2}".format(file_path, key_prefix, settings.S3_BACKUP_BUCKET)) print("Uploading {0} to {1} on {2}".format(file_path, key_prefix, settings.S3_BACKUP_BUCKET))
sys.stdout.flush() sys.stdout.flush()
upload_rotate(file_path, settings.S3_BACKUP_BUCKET, key_prefix) upload_rotate(file_path, settings.S3_BACKUP_BUCKET, key_prefix)
@ -40,7 +39,7 @@ def upload_rotate(file_path, s3_bucket, s3_key_prefix):
Ex file-2015-12-28.tar.bz2 Ex file-2015-12-28.tar.bz2
''' '''
key = ''.join([s3_key_prefix, os.path.basename(file_path)]) key = ''.join([s3_key_prefix, os.path.basename(file_path)])
logger.debug("Uploading {0} to {1}".format(file_path, key)) print("Uploading {0} to {1}".format(file_path, key))
upload(file_path, s3_bucket, key) upload(file_path, s3_bucket, key)
file_root, file_ext = splitext(os.path.basename(file_path)) file_root, file_ext = splitext(os.path.basename(file_path))
@ -50,7 +49,7 @@ def upload_rotate(file_path, s3_bucket, s3_key_prefix):
if not match: if not match:
raise Exception('File does not contain a timestamp') raise Exception('File does not contain a timestamp')
key_prefix = ''.join([s3_key_prefix, match.group('filename')]) key_prefix = ''.join([s3_key_prefix, match.group('filename')])
logger.debug('Rotating files on S3 with key prefix {0} and extension {1}'.format(key_prefix, file_ext)) print('Rotating files on S3 with key prefix {0} and extension {1}'.format(key_prefix, file_ext))
rotate(key_prefix, file_ext, s3_bucket) rotate(key_prefix, file_ext, s3_bucket)