repair: remember the good chunks

if we do not lose the original chunk ids list when "repairing" a file (replacing missing
chunks with all-zero chunks), we have a chance to heal the file back into its original
state later, in case the chunks re-appear (e.g. in a fresh backup).
This commit is contained in:
Thomas Waldmann 2016-07-06 22:42:18 +02:00
parent 8db670cf7f
commit 5105a0a5a6
1 changed files with 4 additions and 1 deletions

View File

@ -701,7 +701,7 @@ Number of files: {0.stats.nfiles}'''.format(
# this set must be kept complete, otherwise the RobustUnpacker might malfunction:
ITEM_KEYS = frozenset([b'path', b'source', b'rdev', b'chunks',
ITEM_KEYS = frozenset([b'path', b'source', b'rdev', b'chunks', b'chunks_healthy',
b'mode', b'user', b'group', b'uid', b'gid', b'mtime', b'atime', b'ctime',
b'xattrs', b'bsdflags', b'acl_nfs4', b'acl_access', b'acl_default', b'acl_extended', ])
@ -933,6 +933,9 @@ class ArchiveChecker:
add_reference(chunk_id, size, csize)
chunk_list.append((chunk_id, size, csize))
offset += size
if b'chunks_healthy' not in item:
# if this is first repair, remember the correct chunk IDs, so we can maybe heal the file later
item[b'chunks_healthy'] = item[b'chunks']
item[b'chunks'] = chunk_list
def robust_iterator(archive):