From 98b0d901e81adc02ee7c6097a4c4844f75fb0fd2 Mon Sep 17 00:00:00 2001 From: Linhai Date: Fri, 24 Dec 2021 15:57:38 -0500 Subject: [PATCH] fixing goroutine leaks --- server/auth/store_test.go | 2 +- server/storage/mvcc/kvstore_test.go | 2 ++ server/storage/mvcc/watchable_store_test.go | 3 ++- server/storage/mvcc/watcher_test.go | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/auth/store_test.go b/server/auth/store_test.go index 71accbd3e..9b637dfe2 100644 --- a/server/auth/store_test.go +++ b/server/auth/store_test.go @@ -33,7 +33,7 @@ import ( ) func dummyIndexWaiter(index uint64) <-chan struct{} { - ch := make(chan struct{}) + ch := make(chan struct{}, 1) go func() { ch <- struct{}{} }() diff --git a/server/storage/mvcc/kvstore_test.go b/server/storage/mvcc/kvstore_test.go index 027430814..be92f13d9 100644 --- a/server/storage/mvcc/kvstore_test.go +++ b/server/storage/mvcc/kvstore_test.go @@ -722,6 +722,8 @@ func TestConcurrentReadTxAndWrite(t *testing.T) { ) b, tmpPath := betesting.NewDefaultTmpBackend(t) s := NewStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{}) + defer b.Close() + defer s.Close() defer os.Remove(tmpPath) var wg sync.WaitGroup diff --git a/server/storage/mvcc/watchable_store_test.go b/server/storage/mvcc/watchable_store_test.go index 7fe881884..75574d6ee 100644 --- a/server/storage/mvcc/watchable_store_test.go +++ b/server/storage/mvcc/watchable_store_test.go @@ -265,7 +265,8 @@ func TestWatchFutureRev(t *testing.T) { s := newWatchableStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{}) defer func() { - s.store.Close() + b.Close() + s.Close() os.Remove(tmpPath) }() diff --git a/server/storage/mvcc/watcher_test.go b/server/storage/mvcc/watcher_test.go index 1086635f4..ebf0181ad 100644 --- a/server/storage/mvcc/watcher_test.go +++ b/server/storage/mvcc/watcher_test.go @@ -216,7 +216,8 @@ func TestWatchDeleteRange(t *testing.T) { s := newWatchableStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{}) defer func() { - s.store.Close() + b.Close() + s.Close() os.Remove(tmpPath) }()