Merge #111616

111616: server: exit logging goroutine if work is done r=rafiss a=rafiss Previously, this goroutine would remain open even after the number of open connections reached 0. Now, once it reaches 0, the logging goroutine will exit. Epic: None Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cockroachdb · Oct 3, 2023 · 5d3ba2d · 5d3ba2d
2 parents f157ff5 + 4e0d257
commit 5d3ba2d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/server/drain.go b/pkg/server/drain.go
@@ -503,7 +503,11 @@ func (s *drainServer) logOpenConns(ctx context.Context) error {
 		for {
 			select {
 			case <-ticker.C:
-				log.Ops.Infof(ctx, "number of open connections: %d\n", s.sqlServer.pgServer.GetConnCancelMapLen())
+				openConns := s.sqlServer.pgServer.GetConnCancelMapLen()
+				log.Ops.Infof(ctx, "number of open connections: %d\n", openConns)
+				if openConns == 0 {
+					return
+				}
 			case <-s.stopper.ShouldQuiesce():
 				return
 			case <-ctx.Done():