upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-15 04:21:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

compact: fix for non-unique archive names

Browse source 
For Archive(), always use the archive id, not the archive name!

Also: sorting by timestamp, improved output.
This commit is contained in:
Thomas Waldmann 2024-09-19 00:05:04 +02:00
parent 61dd29b815
commit 6b68b5a4a7
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/archiver/compact_cmd.py
View file

@ -62,7 +62,7 @@ class ArchiveGarbageCollector:
"""Iterate over all items in all archives, create the dicts id -> size of all used/wanted chunks."""
used_chunks = {} # chunks referenced by item.chunks
wanted_chunks = {} # additional "wanted" chunks seen in item.chunks_healthy
archive_infos = self.manifest.archives.list()
archive_infos = self.manifest.archives.list(sort_by=["ts"])
num_archives = len(archive_infos)
pi = ProgressIndicatorPercent(
total=num_archives, msg="Computing used/wanted chunks %3.1f%%", step=0.1, msgid="compact.analyze_archives"
@ -70,8 +70,8 @@ class ArchiveGarbageCollector:
total_size, total_files = 0, 0
for i, info in enumerate(archive_infos):
pi.show(i)
logger.info(f"Analyzing archive {info.name} ({i + 1}/{num_archives})")
archive = Archive(self.manifest, info.name)
logger.info(f"Analyzing archive {info.name} {info.ts} {bin_to_hex(info.id)} ({i + 1}/{num_archives})")
archive = Archive(self.manifest, info.id)
# archive metadata size unknown, but usually small/irrelevant:
used_chunks[archive.id] = 0
for id in archive.metadata.item_ptrs: