Merge pull request #16204 from kensou97/release-3.5

[3.5] clientv3: create keepAliveCtxCloser goroutine only if ctx can be canc…
etcd-io · Jul 14, 2023 · c7d9708 · c7d9708
2 parents f3e1156 + 4d7b7e5
commit c7d9708
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/client/v3/lease.go b/client/v3/lease.go
@@ -294,7 +294,9 @@ func (l *lessor) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAl
 	}
 	l.mu.Unlock()
 
-	go l.keepAliveCtxCloser(ctx, id, ka.donec)
+	if ctx.Done() != nil {
+		go l.keepAliveCtxCloser(ctx, id, ka.donec)
+	}
 	l.firstKeepAliveOnce.Do(func() {
 		go l.recvKeepAliveLoop()
 		go l.deadlineLoop()