executor: fix goroutine leak when exceed quota in hash agg (#58078) (#61805)

ti-chi-bot · web-flow · commit 7e29bf78b46c · 2025-06-27T02:47:30.000Z
close #58004
diff --git a/pkg/executor/aggregate/agg_hash_executor.go b/pkg/executor/aggregate/agg_hash_executor.go
@@ -190,7 +190,9 @@ func (e *HashAggExec) Close() error {
 		channel.Clear(e.finalOutputCh)
 		e.executed = false
 		if e.memTracker != nil {
-			e.memTracker.ReplaceBytesUsed(0)
+			if e.memTracker.BytesConsumed() > 0 {
+				e.memTracker.ReplaceBytesUsed(0)
+			}
 		}
 		e.parallelExecValid = false
 	}
@@ -351,6 +353,7 @@ func (e *HashAggExec) fetchChildData(ctx context.Context, waitGroup *sync.WaitGr
 		ok    bool
 		err   error
 	)
+
 	defer func() {
 		if r := recover(); r != nil {
 			recoveryHashAgg(e.finalOutputCh, r)

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,9 @@ func (e *HashAggExec) Close() error {`
`190`	`190`	`channel.Clear(e.finalOutputCh)`
`191`	`191`	`e.executed = false`
`192`	`192`	`if e.memTracker != nil {`
`193`		`- e.memTracker.ReplaceBytesUsed(0)`
	`193`	`+ if e.memTracker.BytesConsumed() > 0 {`
	`194`	`+ e.memTracker.ReplaceBytesUsed(0)`
	`195`	`+ }`
`194`	`196`	`}`
`195`	`197`	`e.parallelExecValid = false`
`196`	`198`	`}`
`@@ -351,6 +353,7 @@ func (e HashAggExec) fetchChildData(ctx context.Context, waitGroup sync.WaitGr`
`351`	`353`	`ok bool`
`352`	`354`	`err error`
`353`	`355`	`)`
	`356`	`+`
`354`	`357`	`defer func() {`
`355`	`358`	`if r := recover(); r != nil {`
`356`	`359`	`recoveryHashAgg(e.finalOutputCh, r)`