-
Notifications
You must be signed in to change notification settings - Fork 5.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
executor: fix auto retry when transaction has select for update #11714
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
Codecov Report
@@ Coverage Diff @@
## master #11714 +/- ##
===============================================
- Coverage 81.4415% 81.312% -0.1296%
===============================================
Files 429 429
Lines 92621 92621
===============================================
- Hits 75432 75312 -120
- Misses 11798 11936 +138
+ Partials 5391 5373 -18 |
Codecov Report
@@ Coverage Diff @@
## master #11714 +/- ##
=========================================
Coverage 81.493% 81.493%
=========================================
Files 429 429
Lines 92830 92830
=========================================
Hits 75650 75650
Misses 11795 11795
Partials 5385 5385 |
/run-all-tests |
/run-unit-test |
/run-unit-test |
LGTM |
zz-jason
approved these changes
Aug 12, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
cherry pick to release-3.0 in PR #11718 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
priority/release-blocker
This issue blocks a release. Please solve it ASAP.
status/LGT2
Indicates that a PR has LGTM 2.
type/bugfix
This PR fixes a bug.
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?
When
@@tidb_disable_txn_auto_retry
is set to0
, transactions will retry automatically when there are write conflicts, but when there are select for update statements, auto-retry should be prevented. A previous PR #10972 makespoint get
plan supportsselect for update
, but didn't setTransactionContext.ForUpdate
to true, so the transaction will retry even it hasselect for update
statements.What is changed and how it works?
extract a function
doLockKeys
that used by bothSelectLock
executor andPointGet
executor. In this function, setTransactionContext.ForUpdate
to true.Check List
Tests
Code changes
Related changes