TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-10-10 04:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

check: test checkPack retries

Browse Source
This commit is contained in:
Michael Eischer
2024-05-09 22:12:53 +02:00
parent 987c3b250c
commit ff0744b3af
2 changed files with 89 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/checker/checker.go
View File

@@ -532,6 +532,21 @@ func (e *partialReadError) Error() string {
// checkPack reads a pack and checks the integrity of all blobs.
func checkPack(ctx context.Context, r restic.Repository, id restic.ID, blobs []restic.Blob, size int64, bufRd *bufio.Reader, dec *zstd.Decoder) error {
err := checkPackInner(ctx, r, id, blobs, size, bufRd, dec)
if err != nil {
// retry pack verification to detect transient errors
err2 := checkPackInner(ctx, r, id, blobs, size, bufRd, dec)
if err2 != nil {
err = err2
} else {
err = fmt.Errorf("check successful on second attempt, original error %w", err)
}
}
return err
}
func checkPackInner(ctx context.Context, r restic.Repository, id restic.ID, blobs []restic.Blob, size int64, bufRd *bufio.Reader, dec *zstd.Decoder) error {
debug.Log("checking pack %v", id.String())
if len(blobs) == 0 {
@@ -725,15 +740,6 @@ func (c *Checker) ReadPacks(ctx context.Context, packs map[restic.ID]int64, p *p
}
err := checkPack(ctx, c.repo, ps.id, ps.blobs, ps.size, bufRd, dec)
if err != nil {
// retry pack verification to detect transient errors
err2 := checkPack(ctx, c.repo, ps.id, ps.blobs, ps.size, bufRd, dec)
if err2 != nil {
err = err2
} else {
err = fmt.Errorf("second check successful, original error %w", err)
}
}
p.Add(1)
if err == nil {