test: fix data race in TestDisableTxnAutoRetry (#14825)

pingcap · Feb 19, 2020 · 5a00c80 · 5a00c80
1 parent 6151db3
commit 5a00c80
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/session/session_test.go b/session/session_test.go
@@ -2674,7 +2674,11 @@ func (s *testSchemaSuite) TestDisableTxnAutoRetry(c *C) {
 
 	// test for disable transaction local latch
 	tk1.Se.GetSessionVars().InRestrictedSQL = false
-	config.GetGlobalConfig().TxnLocalLatches.Enabled = false
+	orgCfg := config.GetGlobalConfig()
+	disableLatchCfg := *orgCfg
+	disableLatchCfg.TxnLocalLatches.Enabled = false
+	config.StoreGlobalConfig(&disableLatchCfg)
+	defer config.StoreGlobalConfig(orgCfg)
 	tk1.MustExec("begin")
 	tk1.MustExec("update no_retry set id = 9")
 
@@ -2686,7 +2690,9 @@ func (s *testSchemaSuite) TestDisableTxnAutoRetry(c *C) {
 	c.Assert(strings.Contains(err.Error(), kv.TxnRetryableMark), IsTrue, Commentf("error: %s", err))
 	tk1.MustExec("rollback")
 
-	config.GetGlobalConfig().TxnLocalLatches.Enabled = true
+	enableLatchCfg := *orgCfg
+	enableLatchCfg.TxnLocalLatches.Enabled = true
+	config.StoreGlobalConfig(&enableLatchCfg)
 	tk1.MustExec("begin")
 	tk2.MustExec("alter table no_retry add index idx(id)")
 	tk2.MustQuery("select * from no_retry").Check(testkit.Rows("8"))