tikv: check lock timeout again after resolving lock (#14066) #14083
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Yilin Chen <[email protected]>
sticnarf
added
type/bugfix
|
LGTM |
zz-jason
approved these changes
Dec 17, 2019
zz-jason
added
status/can-merge
|
Your auto merge job has been accepted, waiting for 13951, 14086 |
|
/run-all-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Yilin Chen [email protected]
What problem does this PR solve?
Fix #14063
What is changed and how it works?
Before resolving locks, we checked whether the locks are expired according to its own TTL. However, it's not accurate because heartbeat only updates the TTL of the primary key.
So we still fetch msBeforeTxnExpired from ResolveLocks. If msBeforeTxnExpired is not zero, it means there are still locks blocking us acquiring the pessimistic lock. We should return timeout error if necessary.
Check List
Tests
Code changes
Release note