Merge pull request etcd-io#13540 from songlh-psu/fixing-3

fixing one panic and two goroutine leaks
girigupt · Dec 21, 2021 · 6927953 · 6927953
2 parents 1e4a345 + 5e8f50b
commit 6927953
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/client/v2/client.go b/client/v2/client.go
@@ -607,7 +607,9 @@ func (c *simpleHTTPClient) Do(ctx context.Context, act httpAction) (*http.Respon
 
 	select {
 	case <-ctx.Done():
-		resp.Body.Close()
+		if resp != nil {
+			resp.Body.Close()
+		}
 		<-done
 		return nil, nil, ctx.Err()
 	case <-done:

diff --git a/server/storage/mvcc/watchable_store_test.go b/server/storage/mvcc/watchable_store_test.go
@@ -35,7 +35,8 @@ func TestWatch(t *testing.T) {
 	s := newWatchableStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{})
 
 	defer func() {
-		s.store.Close()
+		b.Close()
+		s.Close()
 		os.Remove(tmpPath)
 	}()
 
@@ -536,7 +537,8 @@ func TestWatchVictims(t *testing.T) {
 	s := newWatchableStore(zap.NewExample(), b, &lease.FakeLessor{}, StoreConfig{})
 
 	defer func() {
-		s.store.Close()
+		b.Close()
+		s.Close()
 		os.Remove(tmpPath)
 		chanBufLen, maxWatchersPerSync = oldChanBufLen, oldMaxWatchersPerSync
 	}()