prune: report failure to list pack files as a fatal error

Motivation: when listing pack files fails during prune (for example due
to a request timeout), the error was returned unwrapped and main printed
it with "%+v", which dumps a stack trace. As discussed in the issue, the
error needs one more level of wrapping before it can be treated as a
fatal error.

Approach: in decidePackAction, wrap an error from listing pack files
with errors.Fatalf("failed to list pack files: %v"). Errors that are
already fatal (e.g. ErrSizeNotMatching) and errors after context
cancellation are returned unchanged. The underlying error is preserved
via Unwrap. Retry log messages are unchanged; only the final error
output is shortened and says where the failure occurred.

Validation: `go test ./internal/repository/ -run Prune` and
`go test ./cmd/restic/ -run Prune` pass. The new test
TestPrunePackListError (backend whose pack list fails) fails without
the change and passes with it. I did not reproduce a real REST backend
timeout.

Report: https://github.com/restic/restic/issues/22120
Signed-off-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com>
Assisted-by: claude-sonnet-5-5 (via Claude Code)
This commit is contained in:
Pujitha Paladugu committed 2026-10-18 12:58:49 -07:00
1 parent dd09b6bd01
commit bba1b68082
3 files changed
+49 -1

No files matched your search

+4 -1
View File
@@ -467,7 +467,10 @@ func decidePackAction(ctx context.Context, opts PruneOptions, repo *Repository,
bar.Done()
if err != nil {
return PrunePlan{}, err
if errors.IsFatal(err) || ctx.Err() != nil {
return PrunePlan{}, err
}
return PrunePlan{}, errors.Fatalf("failed to list pack files: %v", err)
}
// At this point indexPacks contains only missing packs!