diff --git a/cmd/restic/cmd_check.go b/cmd/restic/cmd_check.go index bcaa46156..86b9a622a 100644 --- a/cmd/restic/cmd_check.go +++ b/cmd/restic/cmd_check.go @@ -197,7 +197,7 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error { } if dupFound { - Printf("\nrun `restic rebuild-index' to correct this\n") + Printf("This is non-critical, you can run `restic rebuild-index' to correct this\n") } if len(errs) > 0 { @@ -208,16 +208,26 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error { } errorsFound := false + orphanedPacks := 0 errChan := make(chan error) Verbosef("check all packs\n") go chkr.Packs(gopts.ctx, errChan) for err := range errChan { + if checker.IsOrphanedPack(err) { + orphanedPacks++ + Verbosef("%v\n", err) + continue + } errorsFound = true fmt.Fprintf(os.Stderr, "%v\n", err) } + if orphanedPacks > 0 { + Verbosef("%d additional files were found in the repo, which likely contain duplicate data.\nYou can run `restic prune` to correct this.\n", orphanedPacks) + } + Verbosef("check snapshots, trees and blobs\n") errChan = make(chan error) go chkr.Structure(gopts.ctx, errChan) diff --git a/internal/checker/checker.go b/internal/checker/checker.go index ca289be10..0b645caa1 100644 --- a/internal/checker/checker.go +++ b/internal/checker/checker.go @@ -181,7 +181,17 @@ type PackError struct { } func (e PackError) Error() string { - return "pack " + e.ID.String() + ": " + e.Err.Error() + return "pack " + e.ID.Str() + ": " + e.Err.Error() +} + +// IsOrphanedPack returns true if the error describes a pack which is not +// contained in any index. +func IsOrphanedPack(err error) bool { + if e, ok := errors.Cause(err).(PackError); ok && e.Orphaned { + return true + } + + return false } // Packs checks that all packs referenced in the index are still available and