session: turn the transaction to pessimistic mode when retrying (#38130…

…) (#45114)
pingcap · Jul 3, 2023 · 3eaac08 · 3eaac08
1 parent 2dd186b
commit 3eaac08
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/session/session.go b/session/session.go
@@ -3160,13 +3160,16 @@ func (s *session) PrepareTxnCtx(ctx context.Context) error {
 	}
 
 	txnMode := ast.Optimistic
-	if !s.sessionVars.IsAutocommit() || s.sessionVars.RetryInfo.Retrying ||
-		config.GetGlobalConfig().PessimisticTxn.PessimisticAutoCommit.Load() {
+	if !s.sessionVars.IsAutocommit() || config.GetGlobalConfig().PessimisticTxn.PessimisticAutoCommit.Load() {
 		if s.sessionVars.TxnMode == ast.Pessimistic {
 			txnMode = ast.Pessimistic
 		}
 	}
 
+	if s.sessionVars.RetryInfo.Retrying {
+		txnMode = ast.Pessimistic
+	}
+
 	return sessiontxn.GetTxnManager(s).EnterNewTxn(ctx, &sessiontxn.EnterNewTxnRequest{
 		Type:    sessiontxn.EnterNewTxnBeforeStmt,
 		TxnMode: txnMode,