store/tikv: fix lockTTL too large if local time is behind timestamp. #13865
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
Codecov Report
@@ Coverage Diff @@
## master #13865 +/- ##
===============================================
- Coverage 81.0525% 80.117% -0.9356%
===============================================
Files 478 474 -4
Lines 124270 117085 -7185
===============================================
- Hits 100724 93805 -6919
+ Misses 16053 15852 -201
+ Partials 7493 7428 -65 |
sticnarf
reviewed
Dec 3, 2019
store/tikv/2pc_test.go
Outdated
| txn.startTS = oracle.ComposeTS(oracle.GetPhysical(time.Now().Add(time.Second*10)), 1) | ||
| txn.SetOption(kv.Pessimistic, true) | ||
| time.Sleep(time.Millisecond * 100) | ||
| err := txn.LockKeys(context.Background(), nil, txn.startTS, kv.LockAlwaysWait, key) |
There was a problem hiding this comment.
Previous code also includes the problem that forUpdateTS is used to calculate TTL by mistake. Need we use a bit larger forUpdateTS here?
AndreMouche
reviewed
Dec 3, 2019
| 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) |
There was a problem hiding this comment.
Seem it is not a stability test
There was a problem hiding this comment.
The ttl check is relaxed to 50ms delay.
|
/run-unit-test |
|
LGTM |
|
/merge |
sre-bot
added
the
status/can-merge
|
/run-all-tests |
|
cherry pick to release-3.0 failed |
This was referenced Dec 3, 2019
XiaTianliang
pushed a commit
to XiaTianliang/tidb
that referenced
this pull request
Dec 21, 2019
|
It seems that, not for sure, we failed to cherry-pick this commit to release-3.0. Please comment '/run-cherry-picker' to try to trigger the cherry-picker if we did fail to cherry-pick this commit before. @coocood PTAL. |
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.
What problem does this PR solve?
elapsed time should only be calculated by local time, otherwise it may be negative and cast to uint64, a value that is too large.
What is changed and how it works?
Use
txn.startTimeto calculate elapsed time.Check List
Tests
Related changes
Release note