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

pkg/workerpool(cdc): fix race between handling error and unregistering handler (#4605) #4682

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4605

What problem does this PR solve?

Issue Number: close #4447

What is changed and how it works?

  • Fixed race between handling error and unregistering handler in pkg/workerpool. The root cause is that, if an error has already caused a handler to be automatically unregistered, Unregister() will return immediately, regardless of whether the error handler has returned. This has caused race in unified sorter.

Check List

Tests

  • Unit test
  • Integration test

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix stability problem in workerpool, which is used by Unified Sorter.

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved area/ticdc Issues or PRs related to TiCDC. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR. labels Feb 24, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2022
@liuzix
Copy link
Contributor

liuzix commented Jun 16, 2022

/run-integration-tests

@liuzix
Copy link
Contributor

liuzix commented Jun 16, 2022

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 5398795

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 16, 2022
@ti-chi-bot ti-chi-bot merged commit c6fdb3b into pingcap:release-5.3 Jun 16, 2022
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (release-5.3@d0e603b). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             release-5.3      #4682   +/-   ##
================================================
  Coverage               ?   55.6407%           
================================================
  Files                  ?        224           
  Lines                  ?      23880           
  Branches               ?          0           
================================================
  Hits                   ?      13287           
  Misses                 ?       9264           
  Partials               ?       1329           

@heibaijian heibaijian added this to the v5.3.2 milestone Jun 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ticdc Issues or PRs related to TiCDC. cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants