fix: Backups now correctly found in /backup root directory

Author: a.b.christie

sql-recovery/docker-entrypoint.sh

@@ -60,13 +60,13 @@ if [ -v BACKUP_VOLUME_IS_S3 ]; then
     S3FS_EXTRA_OPTIONS+=" -o ${BACKUP_VOLUME_S3_REQUEST_STYLE}"
   fi
 
-  # Create the target directory ('/recovery')
+  # Create the target directory ('/backup')
   # and then invoke s3fs
   mkdir -p /backup
   S3FS_CMD_OPTIONS="-o passwd_file=/tmp/.passwd-s3fs ${S3FS_EXTRA_OPTIONS}"
   echo "--] s3fs AWS_BUCKET_NAME=${AWS_BUCKET_NAME}"
   echo "--] s3fs S3FS_CMD_OPTIONS=${S3FS_CMD_OPTIONS}"
-  s3fs ${AWS_BUCKET_NAME} /recovery ${S3FS_CMD_OPTIONS}
+  s3fs ${AWS_BUCKET_NAME} /backup ${S3FS_CMD_OPTIONS}
 
   # And then wait (to avoid weird /backup root directories not existing)
   echo "--] Sleeping for 4 seconds..."

sql-recovery/recovery.py

@@ -202,6 +202,8 @@
 # Do not stop on error?
 DO_NOT_STOP_ON_ERROR = os.environ.get('DO_NOT_STOP_ON_ERROR', '')
 
+# The backup root (where backups can be found)
+BACKUP_ROOT_DIR = '/backup'
 # The recovery root dir, where backups are unpacked.
 RECOVERY_ROOT_DIR = '/recovery'
 DECOMPRESSED_RECOVERY_NAME = 'recovery'
@@ -397,6 +399,9 @@ def error(error_no):
 if not os.path.isdir(RECOVERY_ROOT_DIR):
     print('--] Recovery root directory does not exist (%s). Leaving.' % RECOVERY_ROOT_DIR)
     error(ERROR_NO_ROOT)
+if not os.path.isdir(BACKUP_ROOT_DIR):
+    print('--] Backup root directory does not exist (%s). Leaving.' % BACKUP_ROOT_DIR)
+    error(ERROR_NO_ROOT)
 
 #####
 # 1 #
@@ -405,7 +410,7 @@ def error(error_no):
     RCLONE_START_TIME = datetime.now()
     print('--] Running rclone [%s]' % RCLONE_START_TIME)
 
-    RCLONE_CMD = 'rclone sync remote:%s %s' % (USE_RCLONE_BUCKET_AND_PATH, RECOVERY_ROOT_DIR)
+    RCLONE_CMD = 'rclone sync remote:%s %s' % (USE_RCLONE_BUCKET_AND_PATH, BACKUP_ROOT_DIR)
     print("    $", RCLONE_CMD)
 
     COMPLETED_PROCESS = subprocess.run(RCLONE_CMD, shell=True,
@@ -430,7 +435,7 @@ def error(error_no):
 # A dictionary of backup files and their directories.
 LATEST_BACKUP = None
 KNOWN_BACKUPS = {}
-FILE_SEARCH = os.path.join(RECOVERY_ROOT_DIR, '**', BACKUP_FILE_PREFIX + '*')
+FILE_SEARCH = os.path.join(BACKUP_ROOT_DIR, '**', BACKUP_FILE_PREFIX + '*')
 BACKUPS = glob.glob(FILE_SEARCH)
 for BACKUP in BACKUPS:
     FILENAME = os.path.basename(BACKUP)
@@ -542,8 +547,6 @@ def error(error_no):
     if COMPLETED_PROCESS.stderr:
         print('--] stderr follows...')
         print(COMPLETED_PROCESS.stderr.decode("utf-8").strip())
-    # Remove the current backup
-    os.remove(BACKUP)
     print('--] Leaving')
     write_termination_message('Unpack failed')
     sys.exit(0)