util: fix datarace and leak in TestGlobalMemoryControlForAnalyze

executor/analyze_col_v2.go

@@ -599,7 +599,7 @@ func (e *AnalyzeColumnsExecV2) subMergeWorker(resultCh chan<- *samplingMergeResu
 		times := val.(int)
 		for i := 0; i < times; i++ {
 			e.memTracker.Consume(5 << 20)
-			time.Sleep(100 * time.Millisecond)
+			time.Sleep(10 * time.Millisecond)
 		}
 	})
 	retCollector := statistics.NewRowSampleCollector(int(e.analyzePB.ColReq.SampleSize), e.analyzePB.ColReq.GetSampleRate(), l)

executor/analyzetest/BUILD.bazel

@@ -8,7 +8,9 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
+    race = "on",
     shard_count = 50,
+    tags = ["no-cache"],
     deps = [
         "//domain",
         "//domain/infosync",

executor/analyzetest/analyze_test.go

@@ -3092,7 +3092,10 @@ func TestGlobalMemoryControlForAnalyze(t *testing.T) {
 		require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/executor/mockAnalyzeMergeWorkerSlowConsume"))
 	}()
 	_, err := tk0.Exec(sql)
+	require.NotNil(t, err)
 	require.True(t, strings.Contains(err.Error(), "Out Of Memory Quota!"))
+	// sleep to wait all workers to consume memory and exit
+	time.Sleep(10 * time.Millisecond)
 	runtime.GC()
 }
 
@@ -3171,7 +3174,8 @@ func TestGlobalMemoryControlForAutoAnalyze(t *testing.T) {
 	rs := tk.MustQuery("select fail_reason from mysql.analyze_jobs where table_name=? and state=? limit 1", "t", "failed")
 	failReason := rs.Rows()[0][0].(string)
 	require.True(t, strings.Contains(failReason, "Out Of Memory Quota!"))
-
+	// sleep to wait all workers to consume memory and exit
+	time.Sleep(10 * time.Millisecond)
 	childTrackers = executor.GlobalAnalyzeMemoryTracker.GetChildrenForTest()
 	require.Len(t, childTrackers, 0)
 }

util/memory/memstats.go

@@ -37,7 +37,7 @@ func ReadMemStats() (memStats *runtime.MemStats) {
 	}
 	failpoint.Inject("ReadMemStats", func(val failpoint.Value) {
 		injectedSize := val.(int)
-		memStats.HeapInuse += uint64(injectedSize)
+		memStats = &runtime.MemStats{HeapInuse: memStats.HeapInuse + uint64(injectedSize)}
 	})
 	return
 }