-
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
store/tikv: increase max backoff time of read requests #25153
Merged
Merged
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
75edd56
store/tikv: increase max backoff time of read requests
sticnarf e0a4da2
Merge branch 'master' into read-backoff
sticnarf dbd77ee
increase max backoff for pessimistic locks
sticnarf bb67238
Merge branch 'master' into read-backoff
sticnarf 42297a1
address comment
sticnarf e367917
Merge remote-tracking branch 'upstream/master' into read-backoff
sticnarf b0ecf26
increase fail count before check
sticnarf ab6d396
address comment
sticnarf 6fb6d1d
Merge branch 'master' into read-backoff
lysu aaaa673
Merge branch 'master' into read-backoff
ti-chi-bot 461c7e6
Merge branch 'master' into read-backoff
ti-chi-bot 4d42c42
fix lint
sticnarf 3e0096f
Merge branch 'master' into read-backoff
ti-chi-bot 1091693
try to fix cla
sticnarf 50ac302
Merge branch 'master' into read-backoff
ti-chi-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -132,10 +132,22 @@ func (action actionPessimisticLock) handleSingleBatch(c *twoPhaseCommitter, bo * | |||||
return errors.Trace(err) | ||||||
} | ||||||
if regionErr != nil { | ||||||
err = bo.Backoff(retry.BoRegionMiss, errors.New(regionErr.String())) | ||||||
/// For other region error and the fake region error, backoff because | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
// there's something wrong. | ||||||
// For the real EpochNotMatch error, don't backoff. | ||||||
if regionErr.GetEpochNotMatch() == nil || isFakeRegionError(regionErr) { | ||||||
err = bo.Backoff(retry.BoRegionMiss, errors.New(regionErr.String())) | ||||||
if err != nil { | ||||||
return errors.Trace(err) | ||||||
} | ||||||
} | ||||||
same, err := batch.relocate(bo, c.store.regionCache) | ||||||
if err != nil { | ||||||
return errors.Trace(err) | ||||||
} | ||||||
if same { | ||||||
continue | ||||||
} | ||||||
err = c.pessimisticLockMutations(bo, action.LockCtx, batch.mutations) | ||||||
return errors.Trace(err) | ||||||
} | ||||||
|
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
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
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.
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.
I think it shouldn't break the loop if the error is not a key error at L779.