Skip to content
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

kv/client: use ephemeral goroutine to handle region range request (#1720) #1800

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1720

What problem does this PR solve?

Fix part bug found in #1599

  • The region request is processed in a block way

https://github.com/pingcap/ticdc/blob/109257825f7805bfc0f87b68d9ef7e969aa19161/cdc/kv/client.go#L578-L591

  • The divideAndSendEventFeedToRegions function scans range into several regions, and dispatch each region via scheduleRegionRequest. There could be stale regions, and these stale regions will be resent to s.requestRangeCh in L646. If the s.requestRangeCh is full, deadlock happens.

https://github.com/pingcap/ticdc/blob/109257825f7805bfc0f87b68d9ef7e969aa19161/cdc/kv/client.go#L627-L648

https://github.com/pingcap/ticdc/blob/109257825f7805bfc0f87b68d9ef7e969aa19161/cdc/kv/client.go#L616-L623

What is changed and how it works?

In order to consume region range request from requestRangeCh as soon as possible, we create a new goroutine to handle it. The sequence of region range we process is not matter, the region lock keeps the region access sequence. Besides the count or frequency of range request is limitted, we use ephemeral goroutine instead of permanent gourotine.

Check List

Tests

  • Unit test
  • Integration test

Release note

  • Fix a deadlock bug in the kv client that deadlock happens when large stale regions exist.

@ti-chi-bot ti-chi-bot added component/kv-client TiKV kv log client component. status/ptal Could you please take a look? size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels May 19, 2021
@ti-chi-bot ti-chi-bot requested a review from ben1009 May 19, 2021 09:56
@ti-chi-bot ti-chi-bot requested review from amyangfei and overvenus May 19, 2021 09:56
@amyangfei amyangfei added this to the v4.0.13 milestone May 19, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 19, 2021
@overvenus
Copy link
Member

/lgtm

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • overvenus

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 19, 2021
@overvenus
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 2c384d1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 19, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #1800 (2c384d1) into release-4.0 (753073a) will decrease coverage by 1.2098%.
The diff coverage is 53.9912%.

@@                 Coverage Diff                 @@
##           release-4.0      #1800        +/-   ##
===================================================
- Coverage      53.7661%   52.5563%   -1.2099%     
===================================================
  Files              153        153                
  Lines            15958      15941        -17     
===================================================
- Hits              8580       8378       -202     
- Misses            6475       6652       +177     
- Partials           903        911         +8     

@lonng lonng added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 19, 2021
@lonng
Copy link
Contributor

lonng commented May 19, 2021

/merge

@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@amyangfei
Copy link
Contributor

/run-unit-tests

@ti-chi-bot ti-chi-bot merged commit f0f47ae into pingcap:release-4.0 May 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/kv-client TiKV kv log client component. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/ptal Could you please take a look? type/bugfix This PR fixes a bug. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants