sql: fix recent leak of a goroutine

Release note: None
cockroachdb · Jul 21, 2022 · 4d4afbc · 4d4afbc
1 parent 457d724
commit 4d4afbc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/sql/conn_executor_exec.go b/pkg/sql/conn_executor_exec.go
@@ -281,6 +281,10 @@ func (ex *connExecutor) execStmtInOpenState(
 
 	var cancelQuery context.CancelFunc
 	ctx, cancelQuery = contextutil.WithCancel(ctx)
+	// When we exit this method, the execution flow must have finished, so
+	// canceling the context here is safe. This cancellation is needed to
+	// prevent a leak of a goroutine.
+	defer cancelQuery()
 
 	makeErrEvent := func(err error) (fsm.Event, fsm.EventPayload, error) {
 		ev, payload := ex.makeErrEvent(err, ast)