1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 01:06:50 +00:00

metadata stream can produce all-zero chunks, fixes #6587

all-zero chunks are propagated as:
CH_ALLOC, data=None, size=len(zeros)

other chunks are:
CH_DATA, data=data, size=len(data)

also: remove the comment with the wrong assumption
This commit is contained in:
Thomas Waldmann 2022-04-14 00:09:53 +02:00
parent b59230380f
commit e199f5bc6c

View file

@ -362,10 +362,18 @@ def flush(self, flush=False):
self.buffer.seek(0)
# The chunker returns a memoryview to its internal buffer,
# thus a copy is needed before resuming the chunker iterator.
# note: this is the items metadata stream chunker, we only will get CH_DATA allocation here (because there are,
# no all-zero chunks in a metadata stream), thus chunk.data will always be bytes/memoryview and allocation
# is always CH_DATA and never CH_ALLOC/CH_HOLE).
chunks = list(bytes(chunk.data) for chunk in self.chunker.chunkify(self.buffer))
# the metadata stream may produce all-zero chunks, so deal
# with CH_ALLOC (and CH_HOLE, for completeness) here.
chunks = []
for chunk in self.chunker.chunkify(self.buffer):
alloc = chunk.meta['allocation']
if alloc == CH_DATA:
data = bytes(chunk.data)
elif alloc in (CH_ALLOC, CH_HOLE):
data = zeros[:chunk.meta['size']]
else:
raise ValueError("chunk allocation has unsupported value of %r" % alloc)
chunks.append(data)
self.buffer.seek(0)
self.buffer.truncate(0)
# Leave the last partial chunk in the buffer unless flush is True