tikv: check lock timeout again after resolving lock #14066
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #14066 +/- ##
================================================
- Coverage 80.6472% 80.1568% -0.4904%
================================================
Files 488 483 -5
Lines 124659 121150 -3509
================================================
- Hits 100534 97110 -3424
+ Misses 16373 16296 -77
+ Partials 7752 7744 -8 |
coocood
reviewed
Dec 16, 2019
| @@ -750,33 +750,49 @@ func (action actionPessimisticLock) handleSingleBatch(c *twoPhaseCommitter, bo * | |||
| // if the lock left behind whose related txn is already committed or rollbacked, | |||
| // (eg secondary locks not committed or rollbacked yet) | |||
| // we cant return "nowait conflict" directly | |||
| if lock.LockType == pb.Op_PessimisticLock { | |||
There was a problem hiding this comment.
I don't think the check is necessary. Blocking by an optimistic lock is possible with large transaction. (Or am I forgetting something...?)
Signed-off-by: Yilin Chen <[email protected]>
tiancaiamao
reviewed
Dec 16, 2019
| // Heartbeats will increase the TTL of the primary key | ||
|
|
||
| // wait until secondary key exceeds its own TTL | ||
| time.Sleep(time.Duration(ManagedLockTTL) * time.Millisecond) |
There was a problem hiding this comment.
Sleep 20s in the test?
There was a problem hiding this comment.
In tests it's 3 seconds. I guess it's acceptable?
tiancaiamao
reviewed
Dec 16, 2019
Signed-off-by: Yilin Chen <[email protected]>
|
LGTM |
|
@sticnarf |
Signed-off-by: Yilin Chen <[email protected]>
|
I've removed the check before resolve lock. PTAL @coocood @tiancaiamao |
|
LGTM |
coocood
added
status/LGT2
coocood
approved these changes
Dec 16, 2019
|
/merge |
sre-bot
added
the
status/can-merge
coocood
added
status/LGT3
|
/run-all-tests |
|
cherry pick to release-3.0 failed |
sticnarf
added a commit
to sticnarf/tidb
that referenced
this pull request
Dec 16, 2019
Signed-off-by: Yilin Chen <[email protected]>
Reminiscent
pushed a commit
to Reminiscent/tidb
that referenced
this pull request
Dec 17, 2019
sre-bot
pushed a commit
that referenced
this pull request
Dec 17, 2019
XiaTianliang
pushed a commit
to XiaTianliang/tidb
that referenced
this pull request
Dec 21, 2019
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
msBeforeTxnExpiredfromResolveLocks. IfmsBeforeTxnExpiredis 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
Side effects
Related changes
Release note