Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

march: fix deadlock when using --fast-list on syncs - fixes #8811

Nick Craig-Wood4fc4898287c7
diff --git a/fs/march/march.go b/fs/march/march.go
index 67a5b5bfa..841ca4cc7 100644
--- a/fs/march/march.go
+++ b/fs/march/march.go
@@ -137,20 +137,22 @@ func (m *March) makeListDir(ctx context.Context, f fs.Fs, includeAll bool, keyFn
)
return func(dir string, callback fs.ListRCallback) (err error) {
mu.Lock()
- defer mu.Unlock()
if !started {
dirCtx := filter.SetUseFilter(m.Ctx, f.Features().FilterAware && !includeAll) // make filter-aware backends constrain List
dirs, dirsErr = walk.NewDirTree(dirCtx, f, m.Dir, includeAll, ci.MaxDepth)
started = true
}
if dirsErr != nil {
+ mu.Unlock()
return dirsErr
}
entries, ok := dirs[dir]
if !ok {
+ mu.Unlock()
return fs.ErrorDirNotFound
}
delete(dirs, dir)
+ mu.Unlock()
// We use a stable sort here just in case there are
// duplicates. Assuming the remote delivers the entries in a