upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-13 19:00:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #8303 from ThomasWaldmann/improve-healing-test-1.4

Browse source 
improve borg check --repair healing tests, see #8302 (1.4-maint)
This commit is contained in:
TW 2024-07-23 20:25:06 +02:00 committed by GitHub
commit 4184cade37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/archive.py
View file

@ -282,6 +282,8 @@ class DownloadPipeline:
for item in items:
if 'chunks' in item:
item.chunks = [ChunkListEntry(*e) for e in item.chunks]
if 'chunks_healthy' in item:
item.chunks_healthy = [ChunkListEntry(*e) for e in item.chunks_healthy]
if filter:
items = [item for item in items if filter(item)]

18
src/borg/testsuite/archiver.py
View file

@ -3959,14 +3959,20 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
self.cmd('check', self.repository_location, exit_code=0)
output = self.cmd('list', '--format={health}#{path}{LF}', self.repository_location + '::archive1', exit_code=0)
self.assert_in('broken#', output)
# check that the file in the old archives has now a different chunk list without the killed chunk
# check that the file in the old archives has now a different chunk list without the killed chunk.
# also check that the correct original chunks list is preserved in item.chunks_healthy.
for archive_name in ('archive1', 'archive2'):
archive, repository = self.open_archive(archive_name)
with repository:
for item in archive.iter_items():
if item.path.endswith('testsuite/archiver.py'):
self.assert_not_equal(valid_chunks, item.chunks)
self.assert_equal(len(valid_chunks), len(item.chunks))
self.assert_not_in(killed_chunk, item.chunks)
self.assert_not_equal(valid_chunks, item.chunks)
self.assert_in('chunks_healthy', item)
self.assert_equal(len(valid_chunks), len(item.chunks_healthy))
self.assert_in(killed_chunk, item.chunks_healthy)
self.assert_equal(valid_chunks, item.chunks_healthy)
break
else:
self.fail('should not happen')
@ -3977,19 +3983,25 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
output = self.cmd('check', '-v', '--repair', self.repository_location, exit_code=0)
self.assert_in('Healed previously missing file chunk', output)
self.assert_in('testsuite/archiver.py: Completely healed previously damaged file!', output)
# check that the file in the old archives has the correct chunks again
# check that the file in the old archives has the correct chunks again.
# also check that chunks_healthy list is removed as it is not needed any more.
for archive_name in ('archive1', 'archive2'):
archive, repository = self.open_archive(archive_name)
with repository:
for item in archive.iter_items():
if item.path.endswith('testsuite/archiver.py'):
self.assert_equal(valid_chunks, item.chunks)
self.assert_not_in('chunks_healthy', item)
break
else:
self.fail('should not happen')
# list is also all-healthy again
output = self.cmd('list', '--format={health}#{path}{LF}', self.repository_location + '::archive1', exit_code=0)
self.assert_not_in('broken#', output)
# check should be fine now (and not show it has healed anything).
output = self.cmd('check', '-v', '--repair', self.repository_location, exit_code=0)
self.assert_not_in('Healed previously missing file chunk', output)
self.assert_not_in('testsuite/archiver.py: Completely healed previously damaged file!', output)
def test_missing_archive_item_chunk(self):
archive, repository = self.open_archive('archive1')