"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
dropbox: fix return status when full to be fatal error
Nick Craig-Wood110bf468a44c
diff --git a/backend/dropbox/batcher.go b/backend/dropbox/batcher.goindex f55223d1f..8f5aba5f4 100644--- a/backend/dropbox/batcher.go+++ b/backend/dropbox/batcher.go@@ -11,7 +11,6 @@ import ("fmt""github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/files"- "github.com/rclone/rclone/fs/fserrors")// finishBatch commits the batch, returning a batch status to poll or maybe complete@@ -21,14 +20,10 @@ func (f *Fs) finishBatch(ctx context.Context, items []*files.UploadSessionFinish}err = f.pacer.Call(func() (bool, error) {complete, err = f.srv.UploadSessionFinishBatchV2(arg)- // If error is insufficient space then don't retry- if e, ok := err.(files.UploadSessionFinishAPIError); ok {- if e.EndpointError != nil && e.EndpointError.Path != nil && e.EndpointError.Path.Tag == files.WriteErrorInsufficientSpace {- err = fserrors.NoRetryError(err)- return false, err- }+ if retry, err := shouldRetryExclude(ctx, err); !retry {+ return retry, err}- // after the first chunk is uploaded, we retry everything+ // after the first chunk is uploaded, we retry everything except the excluded errorsreturn err != nil, err})if err != nil {diff --git a/backend/dropbox/dropbox.go b/backend/dropbox/dropbox.goindex c1762a506..82eee8e69 100644--- a/backend/dropbox/dropbox.go+++ b/backend/dropbox/dropbox.go@@ -318,32 +318,46 @@ func (f *Fs) Features() *fs.Features {return f.features}-// shouldRetry returns a boolean as to whether this err deserves to be-// retried. It returns the err as a convenience-func shouldRetry(ctx context.Context, err error) (bool, error) {- if fserrors.ContextError(ctx, &err) {+// Some specific errors which should be excluded from retries+func shouldRetryExclude(ctx context.Context, err error) (bool, error) {+ if err == nil {return false, err}- if err == nil {+ if fserrors.ContextError(ctx, &err) {return false, err}- errString := err.Error()// First check for specific errors+ //+ // These come back from the SDK in a whole host of different+ // error types, but there doesn't seem to be a consistent way+ // of reading the error cause, so here we just check using the+ // error string which isn't perfect but does the job.+ errString := err.Error()if strings.Contains(errString, "insufficient_space") {return false, fserrors.FatalError(err)} else if strings.Contains(errString, "malformed_path") {return false, fserrors.NoRetryError(err)}+ return true, err+}++// shouldRetry returns a boolean as to whether this err deserves to be+// retried. It returns the err as a convenience+func shouldRetry(ctx context.Context, err error) (bool, error) {+ if retry, err := shouldRetryExclude(ctx, err); !retry {+ return retry, err+ }// Then handle any official Retry-After header from Dropbox's SDKswitch e := err.(type) {case auth.RateLimitAPIError:if e.RateLimitError.RetryAfter > 0 {- fs.Logf(errString, "Too many requests or write operations. Trying again in %d seconds.", e.RateLimitError.RetryAfter)+ fs.Logf(nil, "Error %v. Too many requests or write operations. Trying again in %d seconds.", err, e.RateLimitError.RetryAfter)err = pacer.RetryAfterError(err, time.Duration(e.RateLimitError.RetryAfter)*time.Second)}return true, err}// Keep old behavior for backward compatibility+ errString := err.Error()if strings.Contains(errString, "too_many_write_operations") || strings.Contains(errString, "too_many_requests") || errString == "" {return true, err}@@ -1700,14 +1714,10 @@ func (o *Object) uploadChunked(ctx context.Context, in0 io.Reader, commitInfo *ferr = o.fs.pacer.Call(func() (bool, error) {entry, err = o.fs.srv.UploadSessionFinish(args, nil)- // If error is insufficient space then don't retry- if e, ok := err.(files.UploadSessionFinishAPIError); ok {- if e.EndpointError != nil && e.EndpointError.Path != nil && e.EndpointError.Path.Tag == files.WriteErrorInsufficientSpace {- err = fserrors.NoRetryError(err)- return false, err- }+ if retry, err := shouldRetryExclude(ctx, err); !retry {+ return retry, err}- // after the first chunk is uploaded, we retry everything+ // after the first chunk is uploaded, we retry everything except the excluded errorsreturn err != nil, err})if err != nil {