"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
vfs: fix a VFS being reused while it is being shut down
Nick Craig-Woodc62aa2adc99f
diff --git a/vfs/vfs.go b/vfs/vfs.goindex 31116c822..1d6ac1631 100644--- a/vfs/vfs.go+++ b/vfs/vfs.go@@ -234,9 +234,10 @@ func New(ctx context.Context, f fs.Fs, opt *vfscommon.Options) *VFS {defer activeMu.Unlock()configName := fs.ConfigString(f)for _, activeVFS := range active[configName] {- if vfs.Opt == activeVFS.Opt {+ // A VFS whose last reference has gone is being shut down+ // but may not have removed itself from the cache yet.+ if vfs.Opt == activeVFS.Opt && activeVFS.Hold() {fs.Debugf(f, "Reusing VFS from active cache")- activeVFS.inUse.Add(1)cancel()return activeVFS}diff --git a/vfs/vfs_test.go b/vfs/vfs_test.goindex c9f9f95cf..710674a80 100644--- a/vfs/vfs_test.go+++ b/vfs/vfs_test.go@@ -174,6 +174,22 @@ func TestVFSHold(t *testing.T) {assert.False(t, vfs.Hold(), "VFS held after being shut down")}+// TestVFSNewShuttingDown checks New doesn't reuse a VFS which is being+// shut down but hasn't yet removed itself from the active cache.+func TestVFSNewShuttingDown(t *testing.T) {+ r := fstest.NewRun(t)+ vfs := New(context.Background(), r.Fremote, nil)++ // The state Shutdown leaves the VFS in while it waits for activeMu+ vfs.inUse.Store(0)+ vfs2 := New(context.Background(), r.Fremote, nil)+ assert.NotSame(t, vfs, vfs2, "reused a VFS being shut down")+ assert.Equal(t, int32(0), vfs.inUse.Load())++ vfs.Shutdown()+ vfs2.Shutdown()+}+// TestVFSNewWithOpts sees if the New command works properlyfunc TestVFSNewWithOpts(t *testing.T) {var opt = vfscommon.Opt