Skip to content

Commit

Permalink
cop: ignore locks with the same start_ts (pingcap#52461)
Browse files Browse the repository at this point in the history
  • Loading branch information
ekexium authored and 3AceShowHand committed Apr 16, 2024
1 parent dbfc50c commit 8dfcee6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions pkg/store/copr/coprocessor.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,17 @@ func (c *CopClient) BuildCopIterator(ctx context.Context, req *kv.Request, vars
buildTaskElapsed: *buildOpt.elapsed,
runawayChecker: req.RunawayChecker,
}
// Pipelined-dml can flush locks when it is still reading.
// The coprocessor of the txn should not be blocked by itself.
// It should be the only case where a coprocessor can read locks of the same ts.
//
// But when start_ts is not obtained from PD,
// the start_ts could conflict with another pipelined-txn's start_ts.
// in which case the locks of same ts cannot be ignored.
// We rely on the assumption: start_ts is not from PD => this is a stale read.
if !req.IsStaleness {
it.resolvedLocks.Put(req.StartTs)
}
it.tasks = tasks
if it.concurrency > len(tasks) {
it.concurrency = len(tasks)
Expand Down
2 changes: 1 addition & 1 deletion pkg/store/mockstore/unistore/cophandler/closure_exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ func safeCopy(b []byte) []byte {
}

func checkLock(lock mvcc.Lock, key []byte, startTS uint64, resolved []uint64) error {
if isResolved(startTS, resolved) {
if isResolved(lock.StartTS, resolved) {
return nil
}
lockVisible := lock.StartTS < startTS
Expand Down

0 comments on commit 8dfcee6

Please sign in to comment.