KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

repository: remove redundant blob loading fallback from RepairPacks

Browse source 
LoadBlobsFromPack already implements the same fallback behavior.
This commit is contained in:
Michael Eischer 2024-05-09 17:46:36 +02:00
parent e401af07b2
commit 433a6aad29
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/repository/repair_pack.go
View file

@ -30,14 +30,10 @@ func RepairPacks(ctx context.Context, repo restic.Repository, ids restic.IDSet,
} }
err := repo.LoadBlobsFromPack(wgCtx, b.PackID, blobs, func(blob restic.BlobHandle, buf []byte, err error) error { err := repo.LoadBlobsFromPack(wgCtx, b.PackID, blobs, func(blob restic.BlobHandle, buf []byte, err error) error {
if err != nil {
// Fallback path
buf, err = repo.LoadBlob(wgCtx, blob.Type, blob.ID, nil)
if err != nil { if err != nil {
printer.E("failed to load blob %v: %v", blob.ID, err) printer.E("failed to load blob %v: %v", blob.ID, err)
return nil return nil
} }
}
id, _, _, err := repo.SaveBlob(wgCtx, blob.Type, buf, restic.ID{}, true) id, _, _, err := repo.SaveBlob(wgCtx, blob.Type, buf, restic.ID{}, true)
if !id.Equal(blob.ID) { if !id.Equal(blob.ID) {
panic("pack id mismatch during upload") panic("pack id mismatch during upload")