*: Always rollback after tests in isolation to make tests stable (#36219

)

close #36212

sessiontxn/isolation/optimistic_test.go

@@ -43,6 +43,8 @@ func TestOptimisticTxnContextProviderTS(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	tk.MustExec("use test")
 	tk.MustExec("create table t(id int primary key, v int)")
 
@@ -132,6 +134,8 @@ func TestOptimisticHandleError(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	provider := initializeOptimisticProvider(t, tk, true)
 	startTS := tk.Session().GetSessionVars().TxnCtx.StartTS
 	checkTS := func() {
@@ -214,6 +218,8 @@ func TestOptimisticProviderInitialize(t *testing.T) {
 		defer clearScopeSettings()
 
 		tk := testkit.NewTestKit(t, store)
+		defer tk.MustExec("rollback")
+
 		se := tk.Session()
 
 		// begin outside a txn
@@ -286,6 +292,8 @@ func TestTidbSnapshotVarInOptimisticTxn(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	se := tk.Session()
 	tk.MustExec("set @@tx_isolation = 'READ-COMMITTED'")
 	safePoint := "20160102-15:04:05 -0700"

sessiontxn/isolation/readcommitted_test.go

@@ -45,6 +45,8 @@ func TestPessimisticRCTxnContextProviderRCCheck(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	tk.MustExec("set @@tidb_rc_read_check_ts=1")
 	se := tk.Session()
 	provider := initializePessimisticRCProvider(t, tk)
@@ -145,7 +147,11 @@ func TestPessimisticRCTxnContextProviderRCCheckForPrepareExecute(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	tk2 := testkit.NewTestKit(t, store)
+	defer tk2.MustExec("rollback")
+
 	tk.MustExec("use test")
 	tk2.MustExec("use test")
 	tk.MustExec("create table t (id int primary key, v int)")
@@ -199,6 +205,8 @@ func TestPessimisticRCTxnContextProviderLockError(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	se := tk.Session()
 	provider := initializePessimisticRCProvider(t, tk)
 
@@ -236,6 +244,8 @@ func TestPessimisticRCTxnContextProviderTS(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	se := tk.Session()
 	provider := initializePessimisticRCProvider(t, tk)
 	compareTS := getOracleTS(t, se)
@@ -293,6 +303,8 @@ func TestRCProviderInitialize(t *testing.T) {
 		defer clearScopeSettings()
 
 		tk := testkit.NewTestKit(t, store)
+		defer tk.MustExec("rollback")
+
 		se := tk.Session()
 		tk.MustExec("set @@tx_isolation = 'READ-COMMITTED'")
 		tk.MustExec("set @@tidb_txn_mode='pessimistic'")
@@ -355,6 +367,8 @@ func TestTidbSnapshotVarInRC(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	se := tk.Session()
 	tk.MustExec("set @@tx_isolation = 'READ-COMMITTED'")
 	safePoint := "20160102-15:04:05 -0700"
@@ -447,8 +461,12 @@ func TestConflictErrorsInRC(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
+
 	se := tk.Session()
+
 	tk2 := testkit.NewTestKit(t, store)
+	defer tk2.MustExec("rollback")
 
 	tk.MustExec("use test")
 	tk2.MustExec("use test")

sessiontxn/isolation/repeatable_read_test.go

@@ -49,6 +49,7 @@ func TestPessimisticRRErrorHandle(t *testing.T) {
 	store, _, clean := testkit.CreateMockStoreAndDomain(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	provider := initializeRepeatableReadProvider(t, tk, true)
 
@@ -139,6 +140,7 @@ func TestRepeatableReadProviderTS(t *testing.T) {
 	store, _, clean := testkit.CreateMockStoreAndDomain(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	provider := initializeRepeatableReadProvider(t, tk, true)
 
@@ -198,6 +200,7 @@ func TestRepeatableReadProviderInitialize(t *testing.T) {
 		defer clearScopeSettings()
 
 		tk := testkit.NewTestKit(t, store)
+		defer tk.MustExec("rollback")
 		se := tk.Session()
 		tk.MustExec("set @@tx_isolation = 'REPEATABLE-READ'")
 		tk.MustExec("set @@tidb_txn_mode='pessimistic'")
@@ -260,6 +263,7 @@ func TestTidbSnapshotVarInPessimisticRepeatableRead(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk.MustExec("set @@tx_isolation = 'REPEATABLE-READ'")
 	safePoint := "20160102-15:04:05 -0700"
@@ -477,6 +481,7 @@ func TestConflictErrorInInsertInRR(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk2 := testkit.NewTestKit(t, store)
 
@@ -506,8 +511,10 @@ func TestConflictErrorInPointGetForUpdateInRR(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk2 := testkit.NewTestKit(t, store)
+	defer tk2.MustExec("rollback")
 
 	tk.MustExec("use test")
 	tk2.MustExec("use test")
@@ -544,8 +551,10 @@ func TestConflictErrorInDeleteInRR(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk2 := testkit.NewTestKit(t, store)
+	defer tk2.MustExec("rollback")
 
 	tk.MustExec("use test")
 	tk2.MustExec("use test")
@@ -582,8 +591,10 @@ func TestConflictErrorInUpdateInRR(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk2 := testkit.NewTestKit(t, store)
+	defer tk2.MustExec("rollback")
 
 	tk.MustExec("use test")
 	tk2.MustExec("use test")
@@ -618,8 +629,10 @@ func TestConflictErrorInOtherQueryContainingPointGet(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk2 := testkit.NewTestKit(t, store)
+	defer tk2.MustExec("rollback")
 
 	tk.MustExec("use test")
 	tk2.MustExec("use test")

sessiontxn/isolation/serializable_test.go

@@ -42,6 +42,7 @@ func TestPessimisticSerializableTxnProviderTS(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	provider := initializePessimisticSerializableProvider(t, tk)
 
@@ -75,6 +76,7 @@ func TestPessimisticSerializableTxnContextProviderLockError(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	provider := initializePessimisticSerializableProvider(t, tk)
 
@@ -116,6 +118,7 @@ func TestSerializableInitialize(t *testing.T) {
 		defer clearScopeSettings()
 
 		tk := testkit.NewTestKit(t, store)
+		defer tk.MustExec("rollback")
 		se := tk.Session()
 		tk.MustExec("set tidb_skip_isolation_level_check = 1")
 		tk.MustExec("set @@tx_isolation = 'SERIALIZABLE'")
@@ -179,6 +182,7 @@ func TestTidbSnapshotVarInSerialize(t *testing.T) {
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
+	defer tk.MustExec("rollback")
 	se := tk.Session()
 	tk.MustExec("set tidb_skip_isolation_level_check = 1")
 	tk.MustExec("set @@tx_isolation = 'SERIALIZABLE'")