2
2
mirror of https://github.com/octoleo/restic.git synced 2024-11-22 12:55:18 +00:00

repository: Push all usage of errors.Fatal out of the package

As the `Fatal` error type only includes a string, it becomes impossible
to inspect the contained error. This is for a example a problem for the
fuse implementation, which must be able to detect context.Canceled
errors.

Co-authored-by: greatroar <61184462+greatroar@users.noreply.github.com>
This commit is contained in:
Michael Eischer 2023-05-13 22:43:42 +02:00
parent a013014c24
commit 5773b86d02
7 changed files with 18 additions and 14 deletions

View File

@ -6,6 +6,7 @@ import (
"github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend"
"github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/debug"
"github.com/restic/restic/internal/errors"
"github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/repository"
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
@ -236,5 +237,8 @@ func copyTree(ctx context.Context, srcRepo restic.Repository, dstRepo restic.Rep
bar := newProgressMax(!quiet, uint64(len(packList)), "packs copied") bar := newProgressMax(!quiet, uint64(len(packList)), "packs copied")
_, err = repository.Repack(ctx, srcRepo, dstRepo, packList, copyBlobs, bar) _, err = repository.Repack(ctx, srcRepo, dstRepo, packList, copyBlobs, bar)
bar.Done() bar.Done()
return err if err != nil {
return errors.Fatal(err.Error())
}
return nil
} }

View File

@ -93,7 +93,7 @@ func runInit(ctx context.Context, opts InitOptions, gopts GlobalOptions, args []
PackSize: gopts.PackSize * 1024 * 1024, PackSize: gopts.PackSize * 1024 * 1024,
}) })
if err != nil { if err != nil {
return err return errors.Fatal(err.Error())
} }
err = s.Init(ctx, version, gopts.password, chunkerPolynomial) err = s.Init(ctx, version, gopts.password, chunkerPolynomial)

View File

@ -729,7 +729,7 @@ func doPrune(ctx context.Context, opts PruneOptions, gopts GlobalOptions, repo r
_, err := repository.Repack(ctx, repo, repo, plan.repackPacks, plan.keepBlobs, bar) _, err := repository.Repack(ctx, repo, repo, plan.repackPacks, plan.keepBlobs, bar)
bar.Done() bar.Done()
if err != nil { if err != nil {
return errors.Fatalf("%s", err) return errors.Fatal(err.Error())
} }
// Also remove repacked packs // Also remove repacked packs

View File

@ -456,7 +456,7 @@ func OpenRepository(ctx context.Context, opts GlobalOptions) (*repository.Reposi
PackSize: opts.PackSize * 1024 * 1024, PackSize: opts.PackSize * 1024 * 1024,
}) })
if err != nil { if err != nil {
return nil, err return nil, errors.Fatal(err.Error())
} }
passwordTriesLeft := 1 passwordTriesLeft := 1

View File

@ -21,7 +21,7 @@ var (
ErrNoKeyFound = errors.New("wrong password or no key found") ErrNoKeyFound = errors.New("wrong password or no key found")
// ErrMaxKeysReached is returned when the maximum number of keys was checked and no key could be found. // ErrMaxKeysReached is returned when the maximum number of keys was checked and no key could be found.
ErrMaxKeysReached = errors.Fatal("maximum number of keys reached") ErrMaxKeysReached = errors.New("maximum number of keys reached")
) )
// Key represents an encrypted master key for a repository. // Key represents an encrypted master key for a repository.

View File

@ -29,7 +29,7 @@ func Repack(ctx context.Context, repo restic.Repository, dstRepo restic.Reposito
debug.Log("repacking %d packs while keeping %d blobs", len(packs), keepBlobs.Len()) debug.Log("repacking %d packs while keeping %d blobs", len(packs), keepBlobs.Len())
if repo == dstRepo && dstRepo.Connections() < 2 { if repo == dstRepo && dstRepo.Connections() < 2 {
return nil, errors.Fatal("repack step requires a backend connection limit of at least two") return nil, errors.New("repack step requires a backend connection limit of at least two")
} }
wg, wgCtx := errgroup.WithContext(ctx) wg, wgCtx := errgroup.WithContext(ctx)

View File

@ -110,16 +110,16 @@ func (c *CompressionMode) Type() string {
// New returns a new repository with backend be. // New returns a new repository with backend be.
func New(be restic.Backend, opts Options) (*Repository, error) { func New(be restic.Backend, opts Options) (*Repository, error) {
if opts.Compression == CompressionInvalid { if opts.Compression == CompressionInvalid {
return nil, errors.Fatalf("invalid compression mode") return nil, errors.New("invalid compression mode")
} }
if opts.PackSize == 0 { if opts.PackSize == 0 {
opts.PackSize = DefaultPackSize opts.PackSize = DefaultPackSize
} }
if opts.PackSize > MaxPackSize { if opts.PackSize > MaxPackSize {
return nil, errors.Fatalf("pack size larger than limit of %v MiB", MaxPackSize/1024/1024) return nil, fmt.Errorf("pack size larger than limit of %v MiB", MaxPackSize/1024/1024)
} else if opts.PackSize < MinPackSize { } else if opts.PackSize < MinPackSize {
return nil, errors.Fatalf("pack size smaller than minimum of %v MiB", MinPackSize/1024/1024) return nil, fmt.Errorf("pack size smaller than minimum of %v MiB", MinPackSize/1024/1024)
} }
repo := &Repository{ repo := &Repository{
@ -593,7 +593,7 @@ func (r *Repository) LoadIndex(ctx context.Context) error {
}) })
if err != nil { if err != nil {
return errors.Fatal(err.Error()) return err
} }
err = r.idx.MergeFinalIndexes() err = r.idx.MergeFinalIndexes()
@ -613,7 +613,7 @@ func (r *Repository) LoadIndex(ctx context.Context) error {
} }
}) })
if invalidIndex { if invalidIndex {
return errors.Fatal("index uses feature not supported by repository version 1") return errors.New("index uses feature not supported by repository version 1")
} }
} }
@ -678,7 +678,7 @@ func (r *Repository) CreateIndexFromPacks(ctx context.Context, packsize map[rest
err = wg.Wait() err = wg.Wait()
if err != nil { if err != nil {
return invalid, errors.Fatal(err.Error()) return invalid, err
} }
return invalid, nil return invalid, nil
@ -723,9 +723,9 @@ func (r *Repository) SearchKey(ctx context.Context, password string, maxKeys int
r.keyID = key.ID() r.keyID = key.ID()
cfg, err := restic.LoadConfig(ctx, r) cfg, err := restic.LoadConfig(ctx, r)
if err == crypto.ErrUnauthenticated { if err == crypto.ErrUnauthenticated {
return errors.Fatalf("config or key %v is damaged: %v", key.ID(), err) return fmt.Errorf("config or key %v is damaged: %w", key.ID(), err)
} else if err != nil { } else if err != nil {
return errors.Fatalf("config cannot be loaded: %v", err) return fmt.Errorf("config cannot be loaded: %w", err)
} }
r.setConfig(cfg) r.setConfig(cfg)