database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store/tikv: fix lockTTL too large if local time is behind timestamp. (#13865)

Browse Source
This commit is contained in:
Ewan Chou
2019-12-03 12:25:55 +08:00
committed by pingcap-github-bot
parent d587c63062
commit a1adfb8c1b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
store/tikv/2pc.go
View File

@ -648,6 +648,8 @@ func (tm *ttlManager) keepAlive(c *twoPhaseCommitter) {
}
newTTL := uptime + ManagedLockTTL
logutil.BgLogger().Info("send TxnHeartBeat",
zap.Uint64("startTS", c.startTS), zap.Uint64("newTTL", newTTL))
startTime := time.Now()
_, err = sendTxnHeartBeat(bo, c.store, c.primary(), c.startTS, newTTL)
if err != nil {
@ -675,9 +677,7 @@ func (action actionPessimisticLock) handleSingleBatch(c *twoPhaseCommitter, bo *
}
mutations[i] = mut
}
t0 := oracle.GetTimeFromTS(c.forUpdateTS)
elapsed := uint64(time.Since(t0) / time.Millisecond)
elapsed := uint64(time.Since(c.txn.startTime) / time.Millisecond)
req := tikvrpc.NewRequest(tikvrpc.CmdPessimisticLock, &pb.PessimisticLockRequest{
Mutations: mutations,
PrimaryLock: c.primary(),

15
store/tikv/2pc_test.go
View File

@ -619,6 +619,21 @@ func (s *testCommitterSuite) TestPessimisticTTL(c *C) {
c.Assert(false, IsTrue, Commentf("update pessimistic ttl fail"))
}
// TestElapsedTTL tests that elapsed time is correct even if ts physical time is greater than local time.
func (s *testCommitterSuite) TestElapsedTTL(c *C) {
key := kv.Key("key")
txn := s.begin(c)
txn.startTS = oracle.ComposeTS(oracle.GetPhysical(time.Now().Add(time.Second*10)), 1)
txn.SetOption(kv.Pessimistic, true)
time.Sleep(time.Millisecond * 100)
forUpdateTS := oracle.ComposeTS(oracle.ExtractPhysical(txn.startTS)+100, 1)
err := txn.LockKeys(context.Background(), nil, forUpdateTS, kv.LockAlwaysWait, key)
c.Assert(err, IsNil)
lockInfo := s.getLockInfo(c, key)
c.Assert(lockInfo.LockTtl-ManagedLockTTL, GreaterEqual, uint64(100))
c.Assert(lockInfo.LockTtl-ManagedLockTTL, Less, uint64(150))
}
func (s *testCommitterSuite) getLockInfo(c *C, key []byte) *kvrpcpb.LockInfo {
txn := s.begin(c)
err := txn.Set(key, key)