Browse Source

Fix broken fallback to dump path introspection when dumps.json is missing. Also add additional logging.

Dan Helfman 18 hours ago
parent
commit
fca647b3ae
1 changed files with 6 additions and 0 deletions
  1. 6 0
      borgmatic/actions/restore.py

+ 6 - 0
borgmatic/actions/restore.py

@@ -278,6 +278,9 @@ def collect_dumps_from_archive(
         local_path=local_path,
         local_path=local_path,
         remote_path=remote_path,
         remote_path=remote_path,
     ):
     ):
+        if not dumps_metadata_path:
+            continue
+
         dumps_from_archive.update(
         dumps_from_archive.update(
             set(
             set(
                 borgmatic.hooks.data_source.dump.parse_data_source_dumps_metadata(
                 borgmatic.hooks.data_source.dump.parse_data_source_dumps_metadata(
@@ -302,10 +305,13 @@ def collect_dumps_from_archive(
 
 
     # If we've successfully loaded any dumps metadata, we're done.
     # If we've successfully loaded any dumps metadata, we're done.
     if dumps_from_archive:
     if dumps_from_archive:
+        logger.debug(f'Collecting database dumps from archive data source dumps metadata files')
+
         return dumps_from_archive
         return dumps_from_archive
 
 
     # No dumps metadata files were found, so for backwards compatibility, fall back to parsing the
     # No dumps metadata files were found, so for backwards compatibility, fall back to parsing the
     # paths of dumps found in the archive to get their respective dump metadata.
     # paths of dumps found in the archive to get their respective dump metadata.
+    logger.debug(f'Collecting database dumps from archive data source dump paths')
     borgmatic_source_directory = str(
     borgmatic_source_directory = str(
         pathlib.Path(borgmatic.config.paths.get_borgmatic_source_directory(config)),
         pathlib.Path(borgmatic.config.paths.get_borgmatic_source_directory(config)),
     )
     )