alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

b2: cancel connection setup after a minute

Browse source 
If the connection to B2 fails, the library enters an endless loop.
This commit is contained in:
Michael Eischer 2022-08-28 14:51:20 +02:00
parent 1b233c4e2e
commit dc2db2de5e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
internal/backend/b2/b2.go
View file

@ -6,6 +6,7 @@ import (
"io" "io"
"net/http" "net/http"
"path" "path"
"time"
"github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend"
"github.com/restic/restic/internal/backend/sema" "github.com/restic/restic/internal/backend/sema"
@ -36,8 +37,14 @@ var _ restic.Backend = &b2Backend{}
func newClient(ctx context.Context, cfg Config, rt http.RoundTripper) (*b2.Client, error) { func newClient(ctx context.Context, cfg Config, rt http.RoundTripper) (*b2.Client, error) {
opts := []b2.ClientOption{b2.Transport(rt)} opts := []b2.ClientOption{b2.Transport(rt)}
// if the connection B2 fails, this can cause the client to hang
// cancel the connection after a minute to at least provide some feedback to the user
ctx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
c, err := b2.NewClient(ctx, cfg.AccountID, cfg.Key.Unwrap(), opts...) c, err := b2.NewClient(ctx, cfg.AccountID, cfg.Key.Unwrap(), opts...)
if err != nil { if err == context.DeadlineExceeded {
return nil, errors.New("connection to B2 failed")
} else if err != nil {
return nil, errors.Wrap(err, "b2.NewClient") return nil, errors.Wrap(err, "b2.NewClient")
} }
return c, nil return c, nil