mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

check for index vs. segment files object count mismatch

This commit is contained in:
Thomas Waldmann 2016-10-04 22:05:26 +02:00
parent 6624ca9cdb
commit cdb8d64fe2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/borg/archive.py
View File

@ -1041,15 +1041,17 @@ class ArchiveChecker:
def verify_data(self): def verify_data(self):
logger.info('Starting cryptographic data integrity verification...') logger.info('Starting cryptographic data integrity verification...')
count = len(self.chunks) chunks_count_index = len(self.chunks)
chunks_count_segments = 0
errors = 0 errors = 0
defect_chunks = [] defect_chunks = []
pi = ProgressIndicatorPercent(total=count, msg="Verifying data %6.2f%%", step=0.01) pi = ProgressIndicatorPercent(total=chunks_count_index, msg="Verifying data %6.2f%%", step=0.01)
marker = None marker = None
while True: while True:
chunk_ids = self.repository.scan(limit=100, marker=marker) chunk_ids = self.repository.scan(limit=100, marker=marker)
if not chunk_ids: if not chunk_ids:
break break
chunks_count_segments += len(chunk_ids)
marker = chunk_ids[-1] marker = chunk_ids[-1]
chunk_data_iter = self.repository.get_many(chunk_ids) chunk_data_iter = self.repository.get_many(chunk_ids)
chunk_ids_revd = list(reversed(chunk_ids)) chunk_ids_revd = list(reversed(chunk_ids))
@ -1078,6 +1080,10 @@ class ArchiveChecker:
logger.error('chunk %s, integrity error: %s', bin_to_hex(chunk_id), integrity_error) logger.error('chunk %s, integrity error: %s', bin_to_hex(chunk_id), integrity_error)
defect_chunks.append(chunk_id) defect_chunks.append(chunk_id)
pi.finish() pi.finish()
if chunks_count_index != chunks_count_segments:
logger.error('Repo/Chunks index object count vs. segment files object count mismatch.')
logger.error('Repo/Chunks index: %d objects != segment files: %d objects',
chunks_count_index, chunks_count_segments)
if defect_chunks: if defect_chunks:
if self.repair: if self.repair:
# if we kill the defect chunk here, subsequent actions within this "borg check" # if we kill the defect chunk here, subsequent actions within this "borg check"
@ -1110,7 +1116,8 @@ class ArchiveChecker:
for defect_chunk in defect_chunks: for defect_chunk in defect_chunks:
logger.debug('chunk %s is defect.', bin_to_hex(defect_chunk)) logger.debug('chunk %s is defect.', bin_to_hex(defect_chunk))
log = logger.error if errors else logger.info log = logger.error if errors else logger.info
log('Finished cryptographic data integrity verification, verified %d chunks with %d integrity errors.', count, errors) log('Finished cryptographic data integrity verification, verified %d chunks with %d integrity errors.',
chunks_count_segments, errors)
def rebuild_manifest(self): def rebuild_manifest(self):
"""Rebuild the manifest object if it is missing """Rebuild the manifest object if it is missing