tikv
/
client-go
mirror of https://github.com/tikv/client-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

error: add function to check if error is undetermined (#300) 

Signed-off-by: disksing <i@disksing.com>
This commit is contained in:
disksing 2021-09-08 13:10:34 +08:00 committed by GitHub
parent 4fc565e203
commit 2d250d555d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
error/error.go
View File

@ -41,6 +41,7 @@ import (
"github.com/pingcap/errors" "github.com/pingcap/errors"
"github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/kvproto/pkg/pdpb" "github.com/pingcap/kvproto/pkg/pdpb"
"github.com/pingcap/parser/terror"
"github.com/tikv/client-go/v2/internal/logutil" "github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/util" "github.com/tikv/client-go/v2/util"
"go.uber.org/zap" "go.uber.org/zap"
@ -259,3 +260,8 @@ func ExtractKeyErr(keyErr *kvrpcpb.KeyError) error {
} }
return errors.Errorf("unexpected KeyError: %s", keyErr.String()) return errors.Errorf("unexpected KeyError: %s", keyErr.String())
} }
// IsErrorUndetermined checks if the error is undetermined error.
func IsErrorUndetermined(err error) bool {
return terror.ErrorEqual(err, terror.ErrResultUndetermined)
}

11
integration_tests/2pc_test.go
View File

@ -51,7 +51,6 @@ import (
"github.com/pingcap/errors" "github.com/pingcap/errors"
"github.com/pingcap/failpoint" "github.com/pingcap/failpoint"
"github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/parser/terror"
drivertxn "github.com/pingcap/tidb/store/driver/txn" drivertxn "github.com/pingcap/tidb/store/driver/txn"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/tikv/client-go/v2/config" "github.com/tikv/client-go/v2/config"
@ -1433,7 +1432,7 @@ func (s *testCommitterSuite) TestFailCommitPrimaryRpcErrors() {
s.Nil(err) s.Nil(err)
err = t1.Commit(context.Background()) err = t1.Commit(context.Background())
s.NotNil(err) s.NotNil(err)
s.True(terror.ErrorEqual(err, terror.ErrResultUndetermined), errors.ErrorStack(err)) s.True(tikverr.IsErrorUndetermined(err), errors.ErrorStack(err))
// We don't need to call "Rollback" after "Commit" fails. // We don't need to call "Rollback" after "Commit" fails.
err = t1.Rollback() err = t1.Rollback()
@ -1454,7 +1453,7 @@ func (s *testCommitterSuite) TestFailCommitPrimaryRegionError() {
s.Nil(err) s.Nil(err)
err = t2.Commit(context.Background()) err = t2.Commit(context.Background())
s.NotNil(err) s.NotNil(err)
s.True(terror.ErrorNotEqual(err, terror.ErrResultUndetermined)) s.False(tikverr.IsErrorUndetermined(err), errors.ErrorStack(err))
} }
// TestFailCommitPrimaryRPCErrorThenRegionError tests the case when commit first // TestFailCommitPrimaryRPCErrorThenRegionError tests the case when commit first
@ -1470,7 +1469,7 @@ func (s *testCommitterSuite) TestFailCommitPrimaryRPCErrorThenRegionError() {
s.Nil(err) s.Nil(err)
err = t1.Commit(context.Background()) err = t1.Commit(context.Background())
s.NotNil(err) s.NotNil(err)
s.True(terror.ErrorEqual(err, terror.ErrResultUndetermined), errors.ErrorStack(err)) s.True(tikverr.IsErrorUndetermined(err), errors.ErrorStack(err))
} }
// TestFailCommitPrimaryKeyError tests KeyError is handled properly when // TestFailCommitPrimaryKeyError tests KeyError is handled properly when
@ -1487,7 +1486,7 @@ func (s *testCommitterSuite) TestFailCommitPrimaryKeyError() {
s.Nil(err) s.Nil(err)
err = t3.Commit(context.Background()) err = t3.Commit(context.Background())
s.NotNil(err) s.NotNil(err)
s.True(terror.ErrorNotEqual(err, terror.ErrResultUndetermined)) s.False(tikverr.IsErrorUndetermined(err))
} }
// TestFailCommitPrimaryRPCErrorThenKeyError tests KeyError overwrites the undeterminedErr. // TestFailCommitPrimaryRPCErrorThenKeyError tests KeyError overwrites the undeterminedErr.
@ -1503,7 +1502,7 @@ func (s *testCommitterSuite) TestFailCommitPrimaryRPCErrorThenKeyError() {
s.Nil(err) s.Nil(err)
err = t3.Commit(context.Background()) err = t3.Commit(context.Background())
s.NotNil(err) s.NotNil(err)
s.False(terror.ErrorEqual(err, terror.ErrResultUndetermined)) s.False(tikverr.IsErrorUndetermined(err))
} }
func (s *testCommitterSuite) TestFailCommitTimeout() { func (s *testCommitterSuite) TestFailCommitTimeout() {

3
integration_tests/async_commit_fail_test.go
View File

@ -43,7 +43,6 @@ import (
"github.com/pingcap/errors" "github.com/pingcap/errors"
"github.com/pingcap/failpoint" "github.com/pingcap/failpoint"
"github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/parser/terror"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
tikverr "github.com/tikv/client-go/v2/error" tikverr "github.com/tikv/client-go/v2/error"
"github.com/tikv/client-go/v2/tikv" "github.com/tikv/client-go/v2/tikv"
@ -87,7 +86,7 @@ func (s *testAsyncCommitFailSuite) TestFailAsyncCommitPrewriteRpcErrors() {
ctx := context.WithValue(context.Background(), util.SessionID, uint64(1)) ctx := context.WithValue(context.Background(), util.SessionID, uint64(1))
err = t1.Commit(ctx) err = t1.Commit(ctx)
s.NotNil(err) s.NotNil(err)
s.True(terror.ErrorEqual(err, terror.ErrResultUndetermined), errors.ErrorStack(err)) s.True(tikverr.IsErrorUndetermined(err), errors.ErrorStack(err))
// We don't need to call "Rollback" after "Commit" fails. // We don't need to call "Rollback" after "Commit" fails.
err = t1.Rollback() err = t1.Rollback()