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.

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

fix shadow index update for double-put (1.2-maint) #7896

Merged

Conversation

ThomasWaldmann
Copy link
Member

@ThomasWaldmann ThomasWaldmann commented Oct 28, 2023

This is to avoid future issues when borg issues a double-put (a put to a chunk id that already exists in the repo - AFAIK it only does that for borg recreate when changing compression and also for each manifest update - but in case of the manifest this maybe never triggered an issue because the manifest was usually written into an own small segment file).

When running borg in client/server mode (with a remote repo), the fix needs to get applied repo/server-side.

the new test is currently failing due to a bug in the
repository code.
this fixes the test added in previous commit (avoids
that the PUT reappears after index rebuild).
@codecov-commenter
Copy link

codecov-commenter commented Oct 28, 2023

Codecov Report

Merging #7896 (8a8837e) into 1.2-maint (c35cdde) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@              Coverage Diff              @@
##           1.2-maint    #7896      +/-   ##
=============================================
- Coverage      82.60%   82.60%   -0.01%     
=============================================
  Files             38       38              
  Lines          10776    10775       -1     
  Branches        2064     2063       -1     
=============================================
- Hits            8902     8901       -1     
  Misses          1327     1327              
  Partials         547      547              
Files Coverage Δ
src/borg/repository.py 83.59% <100.00%> (-0.02%) ⬇️

@ThomasWaldmann ThomasWaldmann merged commit 686714c into borgbackup:1.2-maint Nov 3, 2023
11 checks passed
@ThomasWaldmann ThomasWaldmann deleted the fix-shadow-index-1.2 branch November 3, 2023 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants