upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-02-20 00:10:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

transfer: checking name is not enough, check name/id and name/ts

Browse source
This commit is contained in:
Thomas Waldmann 2024-09-15 13:31:12 +02:00
parent 426d1c7dda
commit dd78b774a0
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/borg/archiver/transfer_cmd.py
View file

@ -7,7 +7,7 @@ from ..constants import * # NOQA
from ..crypto.key import uses_same_id_hash, uses_same_chunker_secret
from ..helpers import Error
from ..helpers import location_validator, Location, archivename_validator, comment_validator
from ..helpers import format_file_size
from ..helpers import format_file_size, bin_to_hex
from ..manifest import Manifest
from ..logger import create_logger
@ -77,14 +77,26 @@ class TransferMixIn:
upgrader = UpgraderCls(cache=cache)
for archive_info in archive_infos:
name = archive_info.name
name, id, ts = archive_info.name, archive_info.id, archive_info.ts
id_hex, ts_str = bin_to_hex(id), ts.isoformat()
transfer_size = 0
present_size = 0
if manifest.archives.exists(name) and not dry_run:
print(f"{name}: archive is already present in destination repo, skipping.")
# at least for borg 1.x -> borg2 transfers, we can not use the id to check for
# already transferred archives (due to upgrade of metadata stream, id will be
# different anyway). so we use archive name and timestamp.
# the name alone might be sufficient for borg 1.x -> 2 transfers, but isn't
# for 2 -> 2 transfers, because borg2 allows duplicate names ("series" feature).
# so, best is to check for both name/ts and name/id.
if not dry_run and manifest.archives.exists_name_and_ts(name, archive_info.ts):
# useful for borg 1.x -> 2 transfers, we have unique names in borg 1.x.
# also useful for borg 2 -> 2 transfers with metadata changes (id changes).
print(f"{name} {ts_str}: archive is already present in destination repo, skipping.")
elif not dry_run and manifest.archives.exists_name_and_id(name, id):
# useful for borg 2 -> 2 transfers without changes (id stays the same)
print(f"{name} {id_hex}: archive is already present in destination repo, skipping.")
else:
if not dry_run:
print(f"{name}: copying archive to destination repo...")
print(f"{name} {ts_str} {id_hex}: copying archive to destination repo...")
other_archive = Archive(other_manifest, name)
archive = (
Archive(manifest, name, cache=cache, create=True, progress=args.progress) if not dry_run else None
@ -164,15 +176,15 @@ class TransferMixIn:
additional_metadata = upgrader.upgrade_archive_metadata(metadata=other_archive.metadata)
archive.save(additional_metadata=additional_metadata)
print(
f"{name}: finished. "
f"{name} {ts_str} {id_hex}: finished. "
f"transfer_size: {format_file_size(transfer_size)} "
f"present_size: {format_file_size(present_size)}"
)
else:
print(
f"{name}: completed"
f"{name} {ts_str} {id_hex}: completed"
if transfer_size == 0
else f"{name}: incomplete, "
else f"{name} {ts_str} {id_hex}: incomplete, "
f"transfer_size: {format_file_size(transfer_size)} "
f"present_size: {format_file_size(present_size)}"
)

13
src/borg/manifest.py
View file

@ -191,6 +191,19 @@ class Archives:
else:
raise NotImplementedError
def exists_name_and_ts(self, name, ts):
# check if an archive with this name AND timestamp exists
assert isinstance(name, str)
assert isinstance(ts, datetime)
if not self.legacy:
for archive_info in self._info_tuples():
if archive_info.name == name and archive_info.ts == ts:
return True
else:
return False
else:
raise NotImplementedError
def _lookup_name(self, name, raw=False):
assert isinstance(name, str)
assert not self.legacy