upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 01:41:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fetch_many: add replacement_chunk=True param

Browse source 
Sometimes, usually for file content chunks, it makes sense to
generate all-zero replacement chunks on-the-fly.

But for e.g. an archive items metadata stream, this does not
make sense (because it wants to msgpack.unpack the data), so
we rather want None. In that case, we do not have the size
information anyway.
This commit is contained in:
Thomas Waldmann 2025-04-01 22:30:21 +02:00
parent 84fe9d2c67
commit 3fdf7a3e78
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/borg/archive.py
View file

@ -273,7 +273,9 @@ class DownloadPipeline:
"""
self.hlids_preloaded = set()
unpacker = msgpack.Unpacker(use_list=False)
for data in self.fetch_many(ids, ro_type=ROBJ_ARCHIVE_STREAM):
for data in self.fetch_many(ids, ro_type=ROBJ_ARCHIVE_STREAM, replacement_chunk=False):
if data is None:
continue # archive stream chunk missing
unpacker.feed(data)
for _item in unpacker:
item = Item(internal_dict=_item)
@ -312,7 +314,7 @@ class DownloadPipeline:
self.repository.preload([c.id for c in item.chunks])
return preload_chunks
def fetch_many(self, chunks, is_preloaded=False, ro_type=None):
def fetch_many(self, chunks, is_preloaded=False, ro_type=None, replacement_chunk=True):
assert ro_type is not None
ids = []
sizes = []
@ -329,8 +331,12 @@ class DownloadPipeline:
ids, sizes, self.repository.get_many(ids, is_preloaded=is_preloaded, raise_missing=False)
):
if cdata is None:
logger.error(f"repository object {bin_to_hex(id)} missing, returning {size} zero bytes.")
data = zeros[:size] if size is not None else None
if replacement_chunk and size is not None:
logger.error(f"repository object {bin_to_hex(id)} missing, returning {size} zero bytes.")
data = zeros[:size] # return an all-zero replacement chunk of correct size
else:
logger.error(f"repository object {bin_to_hex(id)} missing, returning None.")
data = None
else:
_, data = self.repo_objs.parse(id, cdata, ro_type=ro_type)
assert size is None or len(data) == size