"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
azureblob,oracleobjectstorage,s3: quit multipart uploads if the context is cancelled
Nick Craig-Wood04dfa6d923eb
diff --git a/backend/azureblob/azureblob.go b/backend/azureblob/azureblob.goindex c7e43ecb4..6b5cace0c 100644--- a/backend/azureblob/azureblob.go+++ b/backend/azureblob/azureblob.go@@ -2162,6 +2162,9 @@ func (w *azChunkWriter) WriteChunk(ctx context.Context, chunkNumber int, readerif chunkNumber <= 8 {return w.f.shouldRetry(ctx, err)}+ if fserrors.ContextError(ctx, &err) {+ return false, err+ }// retry all chunks once have done the first fewreturn true, err}diff --git a/backend/oracleobjectstorage/multipart.go b/backend/oracleobjectstorage/multipart.goindex c0d9d4600..d3f471b91 100644--- a/backend/oracleobjectstorage/multipart.go+++ b/backend/oracleobjectstorage/multipart.go@@ -22,6 +22,7 @@ import ("github.com/oracle/oci-go-sdk/v65/objectstorage""github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/chunksize"+ "github.com/rclone/rclone/fs/fserrors""github.com/rclone/rclone/fs/hash")@@ -183,6 +184,9 @@ func (w *objectChunkWriter) WriteChunk(ctx context.Context, chunkNumber int, reaif ossPartNumber <= 8 {return shouldRetry(ctx, resp.HTTPResponse(), err)}+ if fserrors.ContextError(ctx, &err) {+ return false, err+ }// retry all chunks once have done the first fewreturn true, err}diff --git a/backend/s3/s3.go b/backend/s3/s3.goindex b8a0acad7..a0eda19ab 100644--- a/backend/s3/s3.go+++ b/backend/s3/s3.go@@ -6175,6 +6175,9 @@ func (w *s3ChunkWriter) WriteChunk(ctx context.Context, chunkNumber int, readerif chunkNumber <= 8 {return w.f.shouldRetry(ctx, err)}+ if fserrors.ContextError(ctx, &err) {+ return false, err+ }// retry all chunks once have done the first fewreturn true, err}