浏览代码

ArchiveChecker: .rebuild_refcounts -> .rebuild_archives

Thomas Waldmann 9 月之前
父节点
当前提交
e9c42a7d6b
共有 1 个文件被更改,包括 4 次插入7 次删除
  1. 4 7
      src/borg/archive.py

+ 4 - 7
src/borg/archive.py

@@ -1645,7 +1645,7 @@ class ArchiveChecker:
                 if not isinstance(repository, (Repository, RemoteRepository)):
                 if not isinstance(repository, (Repository, RemoteRepository)):
                     del self.chunks[Manifest.MANIFEST_ID]
                     del self.chunks[Manifest.MANIFEST_ID]
                 self.manifest = self.rebuild_manifest()
                 self.manifest = self.rebuild_manifest()
-        self.rebuild_refcounts(
+        self.rebuild_archives(
             match=match, first=first, last=last, sort_by=sort_by, older=older, oldest=oldest, newer=newer, newest=newest
             match=match, first=first, last=last, sort_by=sort_by, older=older, oldest=oldest, newer=newer, newest=newest
         )
         )
         self.finish()
         self.finish()
@@ -1830,13 +1830,10 @@ class ArchiveChecker:
         logger.info("Manifest rebuild complete.")
         logger.info("Manifest rebuild complete.")
         return manifest
         return manifest
 
 
-    def rebuild_refcounts(
+    def rebuild_archives(
         self, first=0, last=0, sort_by="", match=None, older=None, newer=None, oldest=None, newest=None
         self, first=0, last=0, sort_by="", match=None, older=None, newer=None, oldest=None, newest=None
     ):
     ):
-        """Rebuild object reference counts by walking the metadata
-
-        Missing and/or incorrect data is repaired when detected
-        """
+        """Analyze and rebuild archives, expecting some damage and trying to make stuff consistent again."""
         # Exclude the manifest from chunks (manifest entry might be already deleted from self.chunks)
         # Exclude the manifest from chunks (manifest entry might be already deleted from self.chunks)
         if not isinstance(self.repository, (Repository, RemoteRepository)):
         if not isinstance(self.repository, (Repository, RemoteRepository)):
             self.chunks.pop(Manifest.MANIFEST_ID, None)
             self.chunks.pop(Manifest.MANIFEST_ID, None)
@@ -2044,7 +2041,7 @@ class ArchiveChecker:
         num_archives = len(archive_infos)
         num_archives = len(archive_infos)
 
 
         pi = ProgressIndicatorPercent(
         pi = ProgressIndicatorPercent(
-            total=num_archives, msg="Checking archives %3.1f%%", step=0.1, msgid="check.rebuild_refcounts"
+            total=num_archives, msg="Checking archives %3.1f%%", step=0.1, msgid="check.rebuild_archives"
         )
         )
         with cache_if_remote(self.repository) as repository:
         with cache_if_remote(self.repository) as repository:
             for i, info in enumerate(archive_infos):
             for i, info in enumerate(archive_infos):