session: add a global/session variable 'tidb_disable_txn_auto_retry' #6872
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
|
@shenli @tiancaiamao @jackysp PTAL |
jackysp
reviewed
Jun 20, 2018
session/session_test.go
Outdated
| tk1.Se.NewTxn() | ||
| // session 2 update the value. | ||
| tk2.MustExec("update no_retry set id = 4") | ||
| // Non-autocommit update will retry, so it would not fail. |
jackysp
reviewed
Jun 20, 2018
session/session_test.go
Outdated
|
|
||
| // session 1 starts a transaction early. | ||
| // execute a select statement to . | ||
| tk1.MustExec("select 1") |
jackysp
reviewed
Jun 20, 2018
| @@ -198,6 +201,7 @@ const ( | |||
| DefTiDBMemQuotaNestedLoopApply = 32 << 30 // 32GB. | |||
| DefTiDBGeneralLog = 0 | |||
| DefTiDBRetryLimit = 10 | |||
| DefTiDBDisableTxnAutoRetry = false | |||
There was a problem hiding this comment.
I think it could be true as default.
There was a problem hiding this comment.
This should be false by default for now. Because many users rely on the auto-retry.
shenli
reviewed
Jun 21, 2018
session/session.go
Outdated
| @@ -346,6 +346,15 @@ func (s *session) doCommitWithRetry(ctx context.Context) error { | |||
| err := s.doCommit(ctx) | |||
| if err != nil { | |||
| commitRetryLimit := s.sessionVars.RetryLimit | |||
| if s.sessionVars.DisableTxnAutoRetry { | |||
There was a problem hiding this comment.
For the internal sessions, we need always enable the auto-retry.
| // For explicit transactions, the statement count is more than 1. | ||
| history := GetHistory(s) | ||
| if history.Count() > 1 { | ||
| commitRetryLimit = 0 |
There was a problem hiding this comment.
No, there are extra works to do below.
|
/rebuild |
|
/run-all-tests |
|
LGTM |
|
/run-all-tests |
|
/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.
What have you changed? (mandatory)
What are the type of the changes (mandatory)?
How has this PR been tested (mandatory)?
Does this PR affect documentation (docs/docs-cn) update? (optional)