"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: fix deadlock with --max-connections with InvalidBlockOrBlob errors
Nick Craig-Wood3f60764bd4ab
diff --git a/backend/azureblob/azureblob.go b/backend/azureblob/azureblob.goindex 0ef8aaa34..2f7c8c927 100644--- a/backend/azureblob/azureblob.go+++ b/backend/azureblob/azureblob.go@@ -2757,6 +2757,8 @@ func (o *Object) clearUncommittedBlocks(ctx context.Context) (err error) {blockList blockblob.GetBlockListResponseproperties *blob.GetPropertiesResponseoptions *blockblob.CommitBlockListOptions+ // Use temporary pacer as this can be called recursively which can cause a deadlock with --max-connections+ pacer = fs.NewPacer(ctx, pacer.NewS3(pacer.MinSleep(minSleep), pacer.MaxSleep(maxSleep), pacer.DecayConstant(decayConstant))))properties, err = o.readMetaDataAlways(ctx)@@ -2768,7 +2770,7 @@ func (o *Object) clearUncommittedBlocks(ctx context.Context) (err error) {if objectExists {// Get the committed block list- err = o.fs.pacer.Call(func() (bool, error) {+ err = pacer.Call(func() (bool, error) {blockList, err = blockBlobSVC.GetBlockList(ctx, blockblob.BlockListTypeAll, nil)return o.fs.shouldRetry(ctx, err)})@@ -2810,7 +2812,7 @@ func (o *Object) clearUncommittedBlocks(ctx context.Context) (err error) {// Commit only the committed blocksfs.Debugf(o, "Committing %d blocks to remove uncommitted blocks", len(blockIDs))- err = o.fs.pacer.Call(func() (bool, error) {+ err = pacer.Call(func() (bool, error) {_, err := blockBlobSVC.CommitBlockList(ctx, blockIDs, options)return o.fs.shouldRetry(ctx, err)})