Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check --repair fixes shadow_index (1.2-maint) #7897

Merged
merged 2 commits into from
Nov 3, 2023
Merged

check --repair fixes shadow_index (1.2-maint) #7897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48feb28
check --repair: test if shadow index is recreated
ThomasWaldmann Oct 28, 2023
a780942
check --repair: recreate shadow index, see #6687
ThomasWaldmann Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/borg/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,7 @@ def _update_index(self, segment, objects, report=None):
s, _ = self.index[key]
self.compact[s] += size
self.segments[s] -= 1
self.shadow_index.setdefault(key, []).append(s)
except KeyError:
pass
self.index[key] = segment, offset
Expand All @@ -935,6 +936,7 @@ def _update_index(self, segment, objects, report=None):
self.segments[s] -= 1
size = self.io.read(s, offset, key, read_data=False)
self.compact[s] += size
self.shadow_index.setdefault(key, []).append(s)
elif tag == TAG_COMMIT:
continue
else:
Expand Down
9 changes: 9 additions & 0 deletions src/borg/testsuite/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,15 @@ def test_hints_persistence(self):
self.assert_equal(compact_expected, self.repository.compact)
del self.repository.segments[2] # ignore the segment created by put(H(42), ...)
self.assert_equal(segments_expected, self.repository.segments)
self.reopen()
self.assert_equal(self.repository.check(repair=True), True)
self.reopen()
self.repository.put(H(42), b'foobar') # this will call prepare_txn() and load the hints data
self.assert_equal(shadow_index_expected, self.repository.shadow_index)
# sizes do not match, with vs. without header?
# self.assert_equal(compact_expected, self.repository.compact)
del self.repository.segments[2] # ignore the segment created by put(H(42), ...)
self.assert_equal(segments_expected, self.repository.segments)

def test_hints_behaviour(self):
self.repository.put(H(0), b'data')
Expand Down
Loading