From 1d4344fc2c5fedf250d537caa7f3ec65744bda8d Mon Sep 17 00:00:00 2001
From: tangenta <tangenta@126.com>
Date: Tue, 13 Jan 2026 18:53:18 +0800
Subject: [PATCH] test: stabilize `TestAuditPluginRetrying` (#65523)

close pingcap/tidb#65222
---
 pkg/server/tests/commontest/tidb_test.go | 55 +++++++++++++++++++-----
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/pkg/server/tests/commontest/tidb_test.go b/pkg/server/tests/commontest/tidb_test.go
index a88dd2a969..dd8f32d480 100644
--- a/pkg/server/tests/commontest/tidb_test.go
+++ b/pkg/server/tests/commontest/tidb_test.go
@@ -3663,6 +3663,29 @@ func TestAuditPluginRetrying(t *testing.T) {
 		retrying bool
 	}
 	testResults := make([]normalTest, 0)
+	var testResultsMu sync.Mutex
+	resetTestResults := func() {
+		testResultsMu.Lock()
+		testResults = testResults[:0]
+		testResultsMu.Unlock()
+	}
+	getTestResults := func() []normalTest {
+		testResultsMu.Lock()
+		res := slices.Clone(testResults)
+		testResultsMu.Unlock()
+		return res
+	}
+	getTestResultsLen := func() int {
+		testResultsMu.Lock()
+		l := len(testResults)
+		testResultsMu.Unlock()
+		return l
+	}
+	appendTestResult := func(res normalTest) {
+		testResultsMu.Lock()
+		testResults = append(testResults, res)
+		testResultsMu.Unlock()
+	}
 
 	onGeneralEvent := func(ctx context.Context, sctx *variable.SessionVars, event plugin.GeneralEvent, cmd string) {
 		// Only consider the Completed event
@@ -3675,7 +3698,7 @@ func TestAuditPluginRetrying(t *testing.T) {
 			audit.retrying = retrying.(bool)
 		}
 		audit.sql = sctx.StmtCtx.OriginalSQL
-		testResults = append(testResults, audit)
+		appendTestResult(audit)
 	}
 	plugin.LoadPluginForTest(t, onGeneralEvent)
 	defer plugin.Shutdown(context.Background())
@@ -3694,24 +3717,33 @@ func TestAuditPluginRetrying(t *testing.T) {
 
 		// a big enough concurrency to trigger retries
 		concurrency := 500
+		db.SetMaxOpenConns(concurrency)
+		db.SetMaxIdleConns(concurrency)
+		updateSQL := "UPDATE auto_retry_test SET val = val + 1 WHERE id = 1"
 		// Usually the following retry-loop will succeed in the first try. However, if we are lucky
 		// enough, it might need more times to trigger the retry.
 		require.Eventually(t, func() bool {
-			testResults = testResults[:0]
+			resetTestResults()
 			var wg sync.WaitGroup
+			errCh := make(chan error, concurrency)
 			for range concurrency {
-				conn, err := db.Conn(context.Background())
-				require.NoError(t, err)
 				wg.Go(func() {
-					_, err := conn.QueryContext(context.Background(), "UPDATE auto_retry_test SET val = val + 1 WHERE id = 1")
-					require.NoError(t, err)
+					_, err := db.ExecContext(context.Background(), updateSQL)
+					if err != nil {
+						errCh <- err
+					}
 				})
 			}
 			wg.Wait()
+			close(errCh)
+			for err := range errCh {
+				require.NoError(t, err)
+			}
 
-			return len(testResults) > concurrency
+			return getTestResultsLen() > concurrency
 		}, time.Second*10, time.Millisecond*100)
 
+		testResults := getTestResults()
 		nonRetryingCount := 0
 		for _, res := range testResults {
 			if !res.retrying {
@@ -3746,14 +3778,14 @@ func TestAuditPluginRetrying(t *testing.T) {
 			return conn
 		}
 
-		testResults = testResults[:0]
+		resetTestResults()
 		var wg sync.WaitGroup
 		// Transaction 1
 		wg.Go(func() {
 			conn := connect()
 			defer conn.Close()
 
-			_, err = conn.ExecContext(context.Background(), "BEGIN")
+			_, err := conn.ExecContext(context.Background(), "BEGIN")
 			require.NoError(t, err)
 			close(step1T1Started)
 			<-step2T2Committed
@@ -3768,7 +3800,7 @@ func TestAuditPluginRetrying(t *testing.T) {
 			conn := connect()
 			defer conn.Close()
 
-			_, err = conn.ExecContext(context.Background(), "BEGIN")
+			_, err := conn.ExecContext(context.Background(), "BEGIN")
 			require.NoError(t, err)
 			_, err = conn.ExecContext(context.Background(), "UPDATE retry_test SET val = val + 20 WHERE id = 1")
 			require.NoError(t, err)
@@ -3779,6 +3811,7 @@ func TestAuditPluginRetrying(t *testing.T) {
 		})
 		wg.Wait()
 
+		testResults := getTestResults()
 		retryingCount := 0
 		nonRetryingCount := 0
 		for _, res := range testResults {
@@ -3811,7 +3844,7 @@ func TestAuditPluginRetrying(t *testing.T) {
 	ts.RunTests(t, nil, func(dbt *testkit.DBTestKit) {
 		db := dbt.GetDB()
 
-		testResults = testResults[:0]
+		resetTestResults()
 		runExplicitTransactionRetry(db, true)
 	})
 }