-
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: fix a concurrency bug that may cause the batchClient timeout (#22239) #22336
Merged
ti-srebot
merged 2 commits into
pingcap:release-4.0
from
ti-srebot:release-4.0-ae7e43249a35
Jan 11, 2021
Merged
store/tikv: fix a concurrency bug that may cause the batchClient timeout (#22239) #22336
ti-srebot
merged 2 commits into
pingcap:release-4.0
from
ti-srebot:release-4.0-ae7e43249a35
Jan 11, 2021
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: ti-srebot <[email protected]>
/run-all-tests |
@tiancaiamao you're already a collaborator in bot's repo. |
hicqu
approved these changes
Jan 11, 2021
LGTM |
1 similar comment
LGTM |
jackysp
approved these changes
Jan 11, 2021
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
/merge |
Your auto merge job has been accepted, waiting for:
|
/run-all-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
component/tikv
status/can-merge
Indicates a PR has been approved by a committer.
status/LGT3
The PR has already had 3 LGTM.
type/bugfix
This PR fixes a bug.
type/4.0-cherry-pick
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.
cherry-pick #22239 to release-4.0
You can switch your code base to this Pull Request by using git-extras:
# In tidb repo: git pr 22336
After apply modifications, you can push your change to this PR via:
What problem does this PR solve?
closes #22334
Problem Summary:
The
recycleIdleConnArray()
logic has a bug: when one goroutinegetConnArray()
and the other goroutine recycle the idle connection, the prior goroutine may get a stalebatchConn
which is closed already.sendBatchRequest()
using that stalebatchConn
would block until timeout.What is changed and how it works?
What's Changed:
This is not enough to protect the conn from been recycle and close.
Now the whole sending process is protected by the read lock, and modify conn map should obtain the write lock.
How it Works:
As long as the sending operation hold the read lock, the recycle connection operation need to wait to obtain the write lock.
Related changes
Maybe we can cherry-pick it to 5.0, it's rare to see this bug in the production environment.
Check List
Tests
Release note