store/tikv: fix ttl manager race (#12398)

pingcap · Sep 26, 2019 · ebce1f0 · ebce1f0
1 parent 5986c6c
commit ebce1f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go
@@ -550,10 +550,6 @@ func (c *twoPhaseCommitter) prewriteSingleBatch(bo *Backoffer, batch batchKeys)
 		prewriteResp := resp.Resp.(*pb.PrewriteResponse)
 		keyErrs := prewriteResp.GetErrors()
 		if len(keyErrs) == 0 {
-			isPrimary := bytes.Equal(batch.keys[0], c.primary())
-			if isPrimary && c.isPessimistic {
-				c.ttlManager.run(c)
-			}
 			return nil
 		}
 		var locks []*Lock
@@ -712,10 +708,6 @@ func (c *twoPhaseCommitter) pessimisticLockSingleBatch(bo *Backoffer, batch batc
 		lockResp := resp.Resp.(*pb.PessimisticLockResponse)
 		keyErrs := lockResp.GetErrors()
 		if len(keyErrs) == 0 {
-			isPrimary := bytes.Equal(batch.keys[0], c.primary())
-			if isPrimary { // No need to check isPessimistic because this function is only called in that case.
-				c.ttlManager.run(c)
-			}
 			return nil
 		}
 		var locks []*Lock

diff --git a/store/tikv/txn.go b/store/tikv/txn.go
@@ -442,6 +442,9 @@ func (txn *tikvTxn) LockKeys(ctx context.Context, forUpdateTS uint64, keysInput
 			}
 			return err
 		}
+		if assignedPrimaryKey {
+			txn.committer.ttlManager.run(txn.committer)
+		}
 	}
 	txn.mu.Lock()
 	txn.lockKeys = append(txn.lockKeys, keys...)