mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-10 06:03:38 +00:00
Code Issues Releases Wiki Activity

check: more consistent messaging considering --repair, fixes #8533

Browse source
This commit is contained in:
Thomas Waldmann 2024-12-25 22:55:42 +01:00
parent f9d91f173a
commit a6dc8c52d0
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/borg/archive.py
View file

@ -1868,6 +1868,8 @@ class ArchiveChecker:
manifest.archives[name] = (chunk_id, archive.time) manifest.archives[name] = (chunk_id, archive.time)
pi.finish() pi.finish()
logger.info('Manifest rebuild complete.') logger.info('Manifest rebuild complete.')
if not self.repair:
logger.warning('The rebuilt manifest will only be committed when using --repair!')
return manifest return manifest
def rebuild_refcounts(self, archive=None, first=0, last=0, sort_by='', glob=None): def rebuild_refcounts(self, archive=None, first=0, last=0, sort_by='', glob=None):
@ -1918,7 +1920,11 @@ class ArchiveChecker:
chunks_healthy = item.chunks_healthy if has_chunks_healthy else chunks_current chunks_healthy = item.chunks_healthy if has_chunks_healthy else chunks_current
if has_chunks_healthy and len(chunks_current) != len(chunks_healthy): if has_chunks_healthy and len(chunks_current) != len(chunks_healthy):
# should never happen, but there was issue #3218. # should never happen, but there was issue #3218.
logger.warning(f'{archive_name}: {item.path}: Invalid chunks_healthy metadata removed!') if self.repair:
msg = 'Invalid chunks_healthy metadata removed!'
else:
msg = 'Invalid chunks_healthy metadata would be removed with --repair!'
logger.warning(f'{archive_name}: {item.path}: {msg}')
del item.chunks_healthy del item.chunks_healthy
has_chunks_healthy = False has_chunks_healthy = False
chunks_healthy = chunks_current chunks_healthy = chunks_current
@ -1927,9 +1933,12 @@ class ArchiveChecker:
if chunk_id not in self.chunks: if chunk_id not in self.chunks:
# a chunk of the healthy list is missing # a chunk of the healthy list is missing
if chunk_current == chunk_healthy: if chunk_current == chunk_healthy:
logger.error('{}: {}: New missing file chunk detected (Byte {}-{}, Chunk {}). ' if self.repair:
'Replacing with all-zero chunk.'.format( msg = 'Replacing with all-zero chunk.'
archive_name, item.path, offset, offset + size, bin_to_hex(chunk_id))) else:
msg = 'Would replace it with all-zero chunk with --repair.'
logger.error(f'{archive_name}: {item.path}: New missing file chunk detected '
f'(Byte {offset}-{offset+size}, Chunk {bin_to_hex(chunk_id)}). {msg}')
self.error_found = chunks_replaced = True self.error_found = chunks_replaced = True
chunk_id, size, csize, cdata = replacement_chunk(size) chunk_id, size, csize, cdata = replacement_chunk(size)
add_reference(chunk_id, size, csize, cdata) add_reference(chunk_id, size, csize, cdata)
@ -1941,9 +1950,12 @@ class ArchiveChecker:
if chunk_id in self.chunks: if chunk_id in self.chunks:
add_reference(chunk_id, size, csize) add_reference(chunk_id, size, csize)
else: else:
logger.warning('{}: {}: Missing all-zero replacement chunk detected (Byte {}-{}, Chunk {}). ' if self.repair:
'Generating new replacement chunk.'.format( msg = 'Generating new replacement chunk.'
archive_name, item.path, offset, offset + size, bin_to_hex(chunk_id))) else:
msg = 'Would generate new replacement chunk with --repair.'
logger.warning(f'{archive_name}: {item.path}: Missing all-zero replacement chunk detected '
f'(Byte {offset}-{offset+size}, Chunk {bin_to_hex(chunk_id)}). {msg}')
self.error_found = chunks_replaced = True self.error_found = chunks_replaced = True
chunk_id, size, csize, cdata = replacement_chunk(size) chunk_id, size, csize, cdata = replacement_chunk(size)
add_reference(chunk_id, size, csize, cdata) add_reference(chunk_id, size, csize, cdata)
@ -1952,8 +1964,12 @@ class ArchiveChecker:
# normal case, all fine. # normal case, all fine.
add_reference(chunk_id, size, csize) add_reference(chunk_id, size, csize)
else: else:
logger.info('{}: {}: Healed previously missing file chunk! (Byte {}-{}, Chunk {}).'.format( if self.repair:
archive_name, item.path, offset, offset + size, bin_to_hex(chunk_id))) msg = 'Healed previously missing file chunk!'
else:
msg = 'Missing file chunk would be healed with --repair!'
logger.info(f'{archive_name}: {item.path}: {msg} '
f'(Byte {offset}-{offset+size}, Chunk {bin_to_hex(chunk_id)})')
add_reference(chunk_id, size, csize) add_reference(chunk_id, size, csize)
mark_as_possibly_superseded(chunk_current[0]) # maybe orphaned the all-zero replacement chunk mark_as_possibly_superseded(chunk_current[0]) # maybe orphaned the all-zero replacement chunk
chunk_list.append([chunk_id, size, csize]) # list-typed element as chunks_healthy is list-of-lists chunk_list.append([chunk_id, size, csize]) # list-typed element as chunks_healthy is list-of-lists
@ -1962,7 +1978,11 @@ class ArchiveChecker:
# if this is first repair, remember the correct chunk IDs, so we can maybe heal the file later # if this is first repair, remember the correct chunk IDs, so we can maybe heal the file later
item.chunks_healthy = item.chunks item.chunks_healthy = item.chunks
if has_chunks_healthy and chunk_list == chunks_healthy: if has_chunks_healthy and chunk_list == chunks_healthy:
logger.info(f'{archive_name}: {item.path}: Completely healed previously damaged file!') if self.repair:
msg = 'Completely healed previously damaged file!'
else:
msg = 'Would completely heal damaged file with --repair!'
logger.info(f'{archive_name}: {item.path}: {msg}')
del item.chunks_healthy del item.chunks_healthy
item.chunks = chunk_list item.chunks = chunk_list
if 'size' in item: if 'size' in item:
@ -2095,7 +2115,11 @@ class ArchiveChecker:
# when upgrading to borg 1.2.5, users are expected to TAM-authenticate all archives they # when upgrading to borg 1.2.5, users are expected to TAM-authenticate all archives they
# trust, so there shouldn't be any without TAM. # trust, so there shouldn't be any without TAM.
logger.error('Archive TAM authentication issue for archive %s: %s', info.name, integrity_error) logger.error('Archive TAM authentication issue for archive %s: %s', info.name, integrity_error)
logger.error('This archive will be *removed* from the manifest! It will be deleted.') if self.repair:
msg = 'This archive will be *removed* from the manifest! It will be deleted.'
else:
msg = 'This archive would be *removed* / *deleted* when using --repair!'
logger.error(msg)
self.error_found = True self.error_found = True
del self.manifest.archives[info.name] del self.manifest.archives[info.name]
continue continue