executor: fix data race of parallel apply operator (#24257) (#24345)

pingcap · Jun 18, 2021 · 2c4be62 · 2c4be62
1 parent d233624
commit 2c4be62
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/executor/parallel_apply.go b/executor/parallel_apply.go
@@ -159,12 +159,14 @@ func (e *ParallelNestedLoopApplyExec) Next(ctx context.Context, req *chunk.Chunk
 // Close implements the Executor interface.
 func (e *ParallelNestedLoopApplyExec) Close() error {
 	e.memTracker = nil
-	err := e.outerExec.Close()
 	if atomic.LoadUint32(&e.started) == 1 {
 		close(e.exit)
 		e.notifyWg.Wait()
 		e.started = 0
 	}
+	// Wait all workers to finish before Close() is called.
+	// Otherwise we may got data race.
+	err := e.outerExec.Close()
 
 	if e.runtimeStats != nil {
 		runtimeStats := newJoinRuntimeStats()