mirror of
https://github.com/restic/restic.git
synced 2026-11-06 07:19:21 +00:00
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)
231 lines
7.3 KiB
Go
231 lines
7.3 KiB
Go
package repository_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"math"
|
|
"math/rand"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/restic/restic/internal/backend"
|
|
resticerrors "github.com/restic/restic/internal/errors"
|
|
"github.com/restic/restic/internal/repository"
|
|
"github.com/restic/restic/internal/repository/pack"
|
|
"github.com/restic/restic/internal/restic"
|
|
rtest "github.com/restic/restic/internal/test"
|
|
)
|
|
|
|
func testPrune(t *testing.T, opts repository.PruneOptions, errOnUnused bool) {
|
|
seed := time.Now().UnixNano()
|
|
random := rand.New(rand.NewSource(seed))
|
|
t.Logf("rand initialized with seed %d", seed)
|
|
|
|
repo, _, be := repository.TestRepositoryWithVersion(t, 0)
|
|
createRandomBlobs(t, random, repo, 4, 0.5, true)
|
|
createRandomBlobs(t, random, repo, 5, 0.5, true)
|
|
keep, _ := selectBlobs(t, random, repo, 0.5)
|
|
|
|
rtest.OK(t, repo.WithBlobUploader(context.TODO(), func(ctx context.Context, uploader restic.BlobSaverWithAsync) error {
|
|
// duplicate a few blobs to exercise those code paths
|
|
for blob := range keep {
|
|
buf, err := repo.LoadBlob(ctx, blob, nil)
|
|
rtest.OK(t, err)
|
|
_, _, _, err = uploader.SaveBlob(ctx, blob.Type, buf, blob.ID, true)
|
|
rtest.OK(t, err)
|
|
}
|
|
return nil
|
|
}))
|
|
|
|
plan, err := repository.PlanPrune(context.TODO(), opts, repo, func(ctx context.Context, repo restic.Repository, usedBlobs restic.FindBlobSet) error {
|
|
for blob := range keep {
|
|
usedBlobs.Insert(blob)
|
|
}
|
|
return nil
|
|
}, restic.NewNoopPrinter())
|
|
rtest.OK(t, err)
|
|
|
|
rtest.OK(t, plan.Execute(context.TODO(), restic.NewNoopPrinter()))
|
|
|
|
repo = repository.TestOpenBackend(t, be)
|
|
repository.TestCheckRepo(t, repo)
|
|
|
|
if errOnUnused {
|
|
existing := listBlobs(repo)
|
|
rtest.Assert(t, existing.Equals(keep), "unexpected blobs, wanted %v got %v", keep, existing)
|
|
}
|
|
}
|
|
|
|
func TestPrune(t *testing.T) {
|
|
for _, test := range []struct {
|
|
name string
|
|
opts repository.PruneOptions
|
|
errOnUnused bool
|
|
}{
|
|
{
|
|
name: "0",
|
|
opts: repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) (unused uint64) { return 0 },
|
|
},
|
|
errOnUnused: true,
|
|
},
|
|
{
|
|
name: "50",
|
|
opts: repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) (unused uint64) { return used / 2 },
|
|
},
|
|
},
|
|
{
|
|
name: "unlimited",
|
|
opts: repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) (unused uint64) { return math.MaxUint64 },
|
|
},
|
|
},
|
|
{
|
|
name: "cachableonly",
|
|
opts: repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) (unused uint64) { return used / 20 },
|
|
RepackCacheableOnly: true,
|
|
},
|
|
},
|
|
{
|
|
name: "small",
|
|
opts: repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) (unused uint64) { return math.MaxUint64 },
|
|
},
|
|
errOnUnused: true,
|
|
},
|
|
} {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
testPrune(t, test.opts, test.errOnUnused)
|
|
})
|
|
t.Run(test.name+"-recovery", func(t *testing.T) {
|
|
opts := test.opts
|
|
opts.UnsafeRecovery = true
|
|
// unsafeNoSpaceRecovery does not repack partially used pack files
|
|
testPrune(t, opts, false)
|
|
})
|
|
}
|
|
}
|
|
|
|
/*
|
|
1.) create repository with packsize of 2M.
|
|
2.) create enough data for 11 packfiles (31 packs)
|
|
3.) run a repository.PlanPrune(...) with a packsize of 16M (current default).
|
|
4.) run plan.Execute(...), extract plan.Stats() and check.
|
|
5.) Check that all blobs are contained in the new packfiles.
|
|
6.) The result should be less packfiles than before
|
|
*/
|
|
func TestPruneSmall(t *testing.T) {
|
|
t.Parallel()
|
|
seed := time.Now().UnixNano()
|
|
random := rand.New(rand.NewSource(seed))
|
|
t.Logf("rand initialized with seed %d", seed)
|
|
|
|
be := repository.TestBackend(t)
|
|
repo, _ := repository.TestRepositoryWithBackend(t, be, 0, repository.Options{PackSize: repository.MinPackSize, Compression: repository.CompressionOff})
|
|
|
|
const blobSize = 1000 * 1000
|
|
const numBlobsCreated = 55
|
|
|
|
keep := restic.NewBlobSet()
|
|
rtest.OK(t, repo.WithBlobUploader(context.TODO(), func(ctx context.Context, uploader restic.BlobSaverWithAsync) error {
|
|
// we need a minimum of 11 packfiles, each packfile will be about 5 Mb long
|
|
for range numBlobsCreated {
|
|
buf := make([]byte, blobSize)
|
|
random.Read(buf)
|
|
|
|
id, _, _, err := uploader.SaveBlob(ctx, restic.DataBlob, buf, restic.ID{}, false)
|
|
rtest.OK(t, err)
|
|
keep.Insert(restic.BlobHandle{Type: restic.DataBlob, ID: id})
|
|
}
|
|
return nil
|
|
}))
|
|
|
|
// gather number of packfiles
|
|
repoPacks, err := pack.Size(context.TODO(), repo, false)
|
|
rtest.OK(t, err)
|
|
lenPackfilesBefore := len(repoPacks)
|
|
rtest.OK(t, repo.Close())
|
|
|
|
// and reopen repository with default packsize
|
|
repo = repository.TestOpenBackend(t, be)
|
|
rtest.OK(t, repo.LoadIndex(context.TODO(), restic.NoopTerminalCounterFactory))
|
|
|
|
opts := repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) (unused uint64) { return blobSize / 4 },
|
|
SmallPackBytes: 5 * 1024 * 1024,
|
|
}
|
|
plan, err := repository.PlanPrune(context.TODO(), opts, repo, func(ctx context.Context, repo restic.Repository, usedBlobs restic.FindBlobSet) error {
|
|
for blob := range keep {
|
|
usedBlobs.Insert(blob)
|
|
}
|
|
return nil
|
|
}, restic.NewNoopPrinter())
|
|
rtest.OK(t, err)
|
|
rtest.OK(t, plan.Execute(context.TODO(), restic.NewNoopPrinter()))
|
|
|
|
stats := plan.Stats()
|
|
rtest.Equals(t, stats.Size.Used/blobSize, uint64(numBlobsCreated), fmt.Sprintf("total size of blobs should be %d but is %d",
|
|
numBlobsCreated, stats.Size.Used/blobSize))
|
|
rtest.Equals(t, stats.Blobs.Used, stats.Blobs.Repack, "the number of blobs should be identical after a repack")
|
|
|
|
// repopen repository
|
|
repo = repository.TestOpenBackend(t, be)
|
|
repository.TestCheckRepo(t, repo)
|
|
|
|
// load all blobs
|
|
for blob := range keep {
|
|
_, err := repo.LoadBlob(context.TODO(), blob, nil)
|
|
rtest.OK(t, err)
|
|
}
|
|
|
|
repoPacks, err = pack.Size(context.TODO(), repo, false)
|
|
rtest.OK(t, err)
|
|
lenPackfilesAfter := len(repoPacks)
|
|
|
|
rtest.Equals(t, lenPackfilesBefore > lenPackfilesAfter, true,
|
|
fmt.Sprintf("the number packfiles before %d and after repack %d", lenPackfilesBefore, lenPackfilesAfter))
|
|
}
|
|
|
|
type failingListBackend struct {
|
|
backend.Backend
|
|
err error
|
|
}
|
|
|
|
func (b *failingListBackend) List(ctx context.Context, t backend.FileType, fn func(backend.FileInfo) error) error {
|
|
if t == backend.PackFile {
|
|
return b.err
|
|
}
|
|
return b.Backend.List(ctx, t, fn)
|
|
}
|
|
|
|
func TestPrunePackListError(t *testing.T) {
|
|
random := rand.New(rand.NewSource(1))
|
|
repo, _, be := repository.TestRepositoryWithVersion(t, 0)
|
|
createRandomBlobs(t, random, repo, 2, 0.5, true)
|
|
|
|
listErr := errors.New("request timeout")
|
|
repo = repository.TestOpenBackend(t, &failingListBackend{Backend: be, err: listErr})
|
|
rtest.OK(t, repo.LoadIndex(context.TODO(), restic.NoopTerminalCounterFactory))
|
|
|
|
_, err := repository.PlanPrune(context.TODO(), repository.PruneOptions{
|
|
MaxRepackBytes: math.MaxUint64,
|
|
MaxUnusedBytes: func(used uint64) uint64 { return used },
|
|
}, repo, func(ctx context.Context, repo restic.Repository, usedBlobs restic.FindBlobSet) error {
|
|
return nil
|
|
}, restic.NewNoopPrinter())
|
|
rtest.Assert(t, err != nil, "expected an error")
|
|
rtest.Assert(t, resticerrors.IsFatal(err), "expected a fatal error, got %v", err)
|
|
rtest.Assert(t, errors.Is(err, listErr), "expected error to wrap the list error, got %v", err)
|
|
rtest.Assert(t, strings.Contains(err.Error(), "failed to list pack files"), "unexpected message %q", err)
|
|
}
|