Added exception catching

backup-docker-to-local.py

@@ -150,17 +150,23 @@ def getFileRsyncDestinationPath(volume_dir):
     return f"{path}/"
 
 def backup_volume(volume_name, volume_dir):
-    """Backup files of a volume with incremental backups."""
-    print(f"Starting backup routine for volume: {volume_name}")
-    files_rsync_destination_path = getFileRsyncDestinationPath(volume_dir)
-    pathlib.Path(files_rsync_destination_path).mkdir(parents=True, exist_ok=True)
+    try:
+        """Backup files of a volume with incremental backups."""
+        print(f"Starting backup routine for volume: {volume_name}")
+        files_rsync_destination_path = getFileRsyncDestinationPath(volume_dir)
+        pathlib.Path(files_rsync_destination_path).mkdir(parents=True, exist_ok=True)
 
-    last_backup_dir = get_last_backup_dir(volume_name, files_rsync_destination_path)
-    link_dest_option = f"--link-dest='{last_backup_dir}'" if last_backup_dir else ""
+        last_backup_dir = get_last_backup_dir(volume_name, files_rsync_destination_path)
+        link_dest_option = f"--link-dest='{last_backup_dir}'" if last_backup_dir else ""
 
-    source_dir = getStoragePath(volume_name)
-    rsync_command = f"rsync -abP --delete --delete-excluded {link_dest_option} {source_dir} {files_rsync_destination_path}"
-    execute_shell_command(rsync_command)
+        source_dir = getStoragePath(volume_name)
+        rsync_command = f"rsync -abP --delete --delete-excluded {link_dest_option} {source_dir} {files_rsync_destination_path}"
+        execute_shell_command(rsync_command)
+    except BackupException as e:
+        if "file has vanished" in e.args[0]:
+            print("Warning: Some files vanished before transfer. Continuing.")
+        else:
+            raise
     print(f"Backup routine for volume: {volume_name} completed.")
 
 def get_image_info(container):
@@ -171,17 +177,14 @@ def has_image(container,image):
     image_info = get_image_info(container)
     return image in image_info[0]
 
-def stop_containers(containers):
+def change_containers_status(containers,status):
     """Stop a list of containers."""
-    container_list = ' '.join(containers)
-    print(f"Stopping containers {container_list}...")
-    execute_shell_command(f"docker stop {container_list}")
-    
-def start_containers(containers):
-    """Start a list of containers."""
-    container_list = ' '.join(containers)
-    print(f"Start containers {container_list}...")
-    execute_shell_command(f"docker start {container_list}")
+    if containers:
+        container_list = ' '.join(containers)
+        print(f"{status} containers {container_list}...")
+        execute_shell_command(f"docker {status} {container_list}")
+    else:
+        print(f"No containers to {status}.")    
 
 def get_container_with_image(containers,image):
     for container in containers:
@@ -217,15 +220,12 @@ def is_image_ignored(container):
     return False
 
 def backup_with_containers_paused(volume_name, volume_dir, containers, shutdown):
-    if containers:
-        stop_containers(containers)
-    else:
-        print(f"{volume_name} has no containers to stop. Skipped.")
+    change_containers_status(containers,'stop')
     backup_volume(volume_name, volume_dir)
     
     # Just restart containers if shutdown is false
     if not shutdown:
-        start_containers(containers)
+        change_containers_status(containers,'start')
 
 def backup_mariadb_or_postgres(container, volume_dir):
     '''Performs database image specific backup procedures'''