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

Fix flaky TestSecondaryListInPrimaryLock (#318)

This commit is contained in:
Yilin Chen 2021-09-29 13:45:23 +08:00 committed by GitHub
parent 4f806a5442
commit ee5063fec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
integration_tests/async_commit_fail_test.go
View File

@ -39,6 +39,7 @@ import (
"context"
"sort"
"testing"
"time"
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
@ -179,16 +180,20 @@ func (s *testAsyncCommitFailSuite) TestSecondaryListInPrimaryLock() {
}
// Ensure the region has been split
bo := tikv.NewBackofferWithVars(context.Background(), 5000, nil)
loc, err := s.store.GetRegionCache().LocateKey(bo, []byte("i"))
s.Nil(err)
s.Equal(loc.StartKey, []byte("h"))
s.Equal(loc.EndKey, []byte("o"))
loc, err = s.store.GetRegionCache().LocateKey(bo, []byte("p"))
s.Nil(err)
s.Equal(loc.StartKey, []byte("o"))
s.Equal(loc.EndKey, []byte("u"))
s.Eventually(func() bool {
checkRegionBound := func(key, startKey, endKey []byte) bool {
bo := tikv.NewBackofferWithVars(context.Background(), 5000, nil)
loc, err := s.store.GetRegionCache().LocateKey(bo, key)
s.Nil(err)
if bytes.Equal(loc.StartKey, startKey) && bytes.Equal(loc.EndKey, endKey) {
return true
}
s.store.GetRegionCache().InvalidateCachedRegion(loc.Region)
return false
}
return checkRegionBound([]byte("i"), []byte("h"), []byte("o")) &&
checkRegionBound([]byte("p"), []byte("o"), []byte("u"))
}, time.Second, 10*time.Millisecond, "region is not split successfully")
var sessionID uint64 = 0
test := func(keys []string, values []string) {
@ -202,7 +207,7 @@ func (s *testAsyncCommitFailSuite) TestSecondaryListInPrimaryLock() {
s.Nil(failpoint.Enable("tikvclient/asyncCommitDoNothing", "return"))
err = txn.Commit(ctx)
err := txn.Commit(ctx)
s.Nil(err)
primary := txn.GetCommitter().GetPrimaryKey()