"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
quatrix: fix chunk upload retries and fix memory leak
Nick Craig-Wood2f0228029eb7
diff --git a/backend/quatrix/quatrix.go b/backend/quatrix/quatrix.goindex f11cf470b..dd9e9d733 100644--- a/backend/quatrix/quatrix.go+++ b/backend/quatrix/quatrix.go@@ -1126,12 +1126,14 @@ func (o *Object) dynamicUpload(ctx context.Context, size int64, modTime time.Tim_, err := io.CopyN(rw, in, localChunk)if err != nil {+ _ = rw.Close()return fmt.Errorf("read chunk with offset %d size %d: %w", offset, localChunk, err)}start := time.Now()err = o.upload(ctx, uploadSession.UploadKey, rw, size, offset, localChunk, options...)+ _ = rw.Close()if err != nil {return fmt.Errorf("upload chunk with offset %d size %d: %w", offset, localChunk, err)}@@ -1218,7 +1220,7 @@ func (o *Object) uploadSession(ctx context.Context, parentID, name string) (uploreturn o.fs.uploadLink(ctx, parentID, encName)}-func (o *Object) upload(ctx context.Context, uploadKey string, chunk io.Reader, fullSize int64, offset int64, chunkSize int64, options ...fs.OpenOption) (err error) {+func (o *Object) upload(ctx context.Context, uploadKey string, chunk io.ReadSeeker, fullSize int64, offset int64, chunkSize int64, options ...fs.OpenOption) (err error) {opts := rest.Opts{Method: "POST",RootURL: fmt.Sprintf(uploadURL, o.fs.opt.Host) + uploadKey,@@ -1231,6 +1233,11 @@ func (o *Object) upload(ctx context.Context, uploadKey string, chunk io.Reader,var fileID stringerr = o.fs.pacer.Call(func() (bool, error) {+ // Rewind the chunk so a retry re-sends it in full+ _, err := chunk.Seek(0, io.SeekStart)+ if err != nil {+ return false, err+ }resp, err := o.fs.srv.CallJSON(ctx, &opts, nil, &fileID)return shouldRetry(ctx, resp, err)})