backend: Correctly retry Save() calls
Make sure the given reader is an io.Seeker and rewind it properly each time.
This commit is contained in:
parent
99b6163e27
commit
8dc952775e
2 changed files with 110 additions and 0 deletions
90
internal/backend/backend_retry_test.go
Normal file
90
internal/backend/backend_retry_test.go
Normal file
|
@ -0,0 +1,90 @@
|
|||
package backend
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"testing"
|
||||
|
||||
"github.com/restic/restic/internal/errors"
|
||||
"github.com/restic/restic/internal/mock"
|
||||
"github.com/restic/restic/internal/restic"
|
||||
"github.com/restic/restic/internal/test"
|
||||
)
|
||||
|
||||
func TestBackendRetrySeeker(t *testing.T) {
|
||||
be := &mock.Backend{
|
||||
SaveFn: func(ctx context.Context, h restic.Handle, rd io.Reader) error {
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
retryBackend := RetryBackend{
|
||||
Backend: be,
|
||||
}
|
||||
|
||||
data := test.Random(24, 23*14123)
|
||||
|
||||
type wrapReader struct {
|
||||
io.Reader
|
||||
}
|
||||
|
||||
var rd io.Reader
|
||||
rd = wrapReader{bytes.NewReader(data)}
|
||||
|
||||
err := retryBackend.Save(context.TODO(), restic.Handle{}, rd)
|
||||
if err == nil {
|
||||
t.Fatal("did not get expected error for retry backend with non-seeker reader")
|
||||
}
|
||||
|
||||
rd = bytes.NewReader(data)
|
||||
_, err = io.CopyN(ioutil.Discard, rd, 5)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = retryBackend.Save(context.TODO(), restic.Handle{}, rd)
|
||||
if err == nil {
|
||||
t.Fatal("did not get expected error for partial reader")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBackendSaveRetry(t *testing.T) {
|
||||
buf := bytes.NewBuffer(nil)
|
||||
errcount := 0
|
||||
be := &mock.Backend{
|
||||
SaveFn: func(ctx context.Context, h restic.Handle, rd io.Reader) error {
|
||||
if errcount == 0 {
|
||||
errcount++
|
||||
_, err := io.CopyN(ioutil.Discard, rd, 120)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return errors.New("injected error")
|
||||
}
|
||||
|
||||
_, err := io.Copy(buf, rd)
|
||||
return err
|
||||
},
|
||||
}
|
||||
|
||||
retryBackend := RetryBackend{
|
||||
Backend: be,
|
||||
}
|
||||
|
||||
data := test.Random(23, 5*1024*1024+11241)
|
||||
err := retryBackend.Save(context.TODO(), restic.Handle{}, bytes.NewReader(data))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if len(data) != buf.Len() {
|
||||
t.Errorf("wrong number of bytes written: want %d, got %d", len(data), buf.Len())
|
||||
}
|
||||
|
||||
if !bytes.Equal(data, buf.Bytes()) {
|
||||
t.Errorf("wrong data written to backend")
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue