"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
accounting: fix goroutine leak in NewStatsGroup for zero-transfer rc jobs
Sanjays2402c91c4cbbffdf
diff --git a/fs/accounting/stats_groups.go b/fs/accounting/stats_groups.goindex f14d6fed4..503ddcefa 100644--- a/fs/accounting/stats_groups.go+++ b/fs/accounting/stats_groups.go@@ -301,9 +301,16 @@ func GlobalStats() *StatsInfo {}// NewStatsGroup creates new stats under named group.+//+// The averageLoop is intentionally NOT started here: it is started on+// demand by NewTransfer / NewTransferRemoteSize when real transfer+// activity begins and stopped by DoneTransferring when the last+// transfer completes. Starting it eagerly leaked one goroutine per+// group that never performed a transfer (issue #9567) - e.g. rcd+// daemons driven by frequent rc sync/move calls where each call gets+// a fresh job/N group and the source is often empty.func NewStatsGroup(ctx context.Context, group string) *StatsInfo {stats := NewStats(ctx)- stats.startAverageLoop()stats.group = groupgroups.set(ctx, group, stats)return statsdiff --git a/fs/accounting/stats_groups_test.go b/fs/accounting/stats_groups_test.goindex e0d156672..4adfb04c4 100644--- a/fs/accounting/stats_groups_test.go+++ b/fs/accounting/stats_groups_test.go@@ -271,3 +271,42 @@ func percentDiff(start, end uint64) uint64 {}return (diff * 100) / start}++// Regression for #9567: NewStatsGroup used to start the averageLoop+// goroutine unconditionally at group creation. When an rcd daemon was+// driven by many rc sync/move calls that transferred zero files, each+// call created a fresh job/N group whose averageLoop was started but+// never stopped (nothing ever went transferring->empty), leaking one+// goroutine per call. The loop must only start on demand from+// NewTransfer / NewTransferRemoteSize, and it must still stop when the+// last transfer completes.+func TestNewStatsGroupDoesNotStartAverageLoop(t *testing.T) {+ ctx := context.Background()+ defer func() {+ groups = newStatsGroups()+ }()++ stats := NewStatsGroup(ctx, "test-group-9567")++ stats.mu.RLock()+ started := stats.average.started+ stats.mu.RUnlock()+ assert.False(t, started,+ "NewStatsGroup must not start averageLoop for a zero-transfer group (issue #9567)")++ // The loop must still start on demand when a real transfer is added,+ // and stop cleanly once the last transfer completes.+ tr := stats.NewTransferRemoteSize("regression-9567", 0, nil, nil)+ stats.mu.RLock()+ startedAfterTransfer := stats.average.started+ stats.mu.RUnlock()+ assert.True(t, startedAfterTransfer,+ "averageLoop should start on demand when a transfer is added")++ tr.Done(ctx, nil)+ stats.mu.RLock()+ startedAfterDone := stats.average.started+ stats.mu.RUnlock()+ assert.False(t, startedAfterDone,+ "averageLoop should stop when the last transfer is done")+}