*: fix data race in the EnableAnalyzeSnapshot (#55596) (#55734)

close #55469
pingcap · Sep 23, 2024 · a2bb8ad · a2bb8ad
1 parent 4b69818
commit a2bb8ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/pkg/executor/analyze.go b/pkg/executor/analyze.go
@@ -460,11 +460,12 @@ func (e *AnalyzeExec) handleResultsErrorWithConcurrency(ctx context.Context, sta
 	var wg util.WaitGroupWrapper
 	saveResultsCh := make(chan *statistics.AnalyzeResults, partitionStatsConcurrency)
 	errCh := make(chan error, partitionStatsConcurrency)
+	enableAnalyzeSnapshot := e.Ctx().GetSessionVars().EnableAnalyzeSnapshot
 	for i := 0; i < partitionStatsConcurrency; i++ {
 		worker := newAnalyzeSaveStatsWorker(saveResultsCh, subSctxs[i], errCh, &e.Ctx().GetSessionVars().Killed)
 		ctx1 := kv.WithInternalSourceType(context.Background(), kv.InternalTxnStats)
 		wg.Run(func() {
-			worker.run(ctx1, e.Ctx().GetSessionVars().EnableAnalyzeSnapshot)
+			worker.run(ctx1, enableAnalyzeSnapshot)
 		})
 	}
 	tableIDs := map[int64]struct{}{}

diff --git a/pkg/executor/test/analyzetest/BUILD.bazel b/pkg/executor/test/analyzetest/BUILD.bazel
@@ -9,6 +9,7 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
+    race = "on",
     shard_count = 50,
     deps = [
         "//pkg/config",

diff --git a/pkg/executor/test/analyzetest/memorycontrol/BUILD.bazel b/pkg/executor/test/analyzetest/memorycontrol/BUILD.bazel
@@ -8,6 +8,7 @@ go_test(
         "memory_control_test.go",
     ],
     flaky = True,
+    race = "on",
     shard_count = 5,
     deps = [
         "//pkg/config",