ttl: fix ttl txn will not return error when rolling back (#39918) (#3…

…9921) close #39917
pingcap · Dec 20, 2022 · 9b70ed7 · 9b70ed7
1 parent 928f6da
commit 9b70ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ttl/session/session.go b/ttl/session/session.go
@@ -107,8 +107,8 @@ func (s *session) RunInTxn(ctx context.Context, fn func() error) (err error) {
  success := false
  defer func() {
  if !success {
- _, err = s.ExecuteSQL(ctx, "ROLLBACK")
- terror.Log(err)
+ _, rollbackErr := s.ExecuteSQL(ctx, "ROLLBACK")
+ terror.Log(rollbackErr)
  }
  }()
 

diff --git a/ttl/session/session_test.go b/ttl/session/session_test.go
@@ -39,10 +39,11 @@ func TestSessionRunInTxn(t *testing.T) {
  }))
  tk2.MustQuery("select * from t order by id asc").Check(testkit.Rows("1 10"))
 
- require.NoError(t, se.RunInTxn(context.TODO(), func() error {
+ err := se.RunInTxn(context.TODO(), func() error {
  tk.MustExec("insert into t values (2, 20)")
- return errors.New("err")
- }))
+ return errors.New("mockErr")
+ })
+ require.EqualError(t, err, "mockErr")
  tk2.MustQuery("select * from t order by id asc").Check(testkit.Rows("1 10"))
 
  require.NoError(t, se.RunInTxn(context.TODO(), func() error {