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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 15 commits into from
Feb 24, 2022
Merged

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

merged 15 commits into from
Feb 24, 2022

Conversation

liuzix
Copy link
Contributor

@liuzix liuzix commented Feb 16, 2022

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.

@liuzix liuzix added type/bugfix This PR fixes a bug. area/ticdc Issues or PRs related to TiCDC. labels Feb 16, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 16, 2022 •
edited
Loading

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

@ti-chi-bot ti-chi-bot added do-not-merge/needs-triage-completed 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. labels Feb 16, 2022
@liuzix
Copy link
Contributor Author

liuzix commented Feb 16, 2022

/run-leak-tests
/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Feb 16, 2022

/run-leak-tests

@liuzix
Copy link
Contributor Author

liuzix commented Feb 16, 2022

/run-verify

@liuzix liuzix added the status/ptal Could you please take a look? label Feb 16, 2022
@liuzix
Copy link
Contributor Author

liuzix commented Feb 16, 2022

/run-check-issue-triage-complete

@liuzix
Copy link
Contributor Author

liuzix commented Feb 16, 2022

/check-issue-triage-complete

@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. and removed do-not-merge/needs-triage-completed labels Feb 16, 2022
@liuzix
Copy link
Contributor Author

liuzix commented Feb 23, 2022

/run-integration-test /tidb=pr/32434

@liuzix
Copy link
Contributor Author

liuzix commented Feb 23, 2022

/run-integration-test /tidb=pr/32434

@ti-chi-bot ti-chi-bot merged commit 79be937 into pingcap:master Feb 24, 2022
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 24, 2022
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#4605
d5200aa 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 24, 2022
Closed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4679.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 24, 2022
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#4605
9dfbfd6 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 24, 2022
Closed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4680.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 24, 2022
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#4605
162e157 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 24, 2022
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4681.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4682.

This was referenced Feb 24, 2022
Merged
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4683.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 24, 2022
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#4605
045b5fe 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 24, 2022
Closed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4684.

ti-chi-bot added a commit that referenced this pull request Apr 14, 2022
@ti-chi-bot
pkg/workerpool(cdc): fix race between handling error and unregisterin…
d92f016 
…g handler (#4605) (#4681)

close #4447
ti-chi-bot added a commit that referenced this pull request Apr 21, 2022
@ti-chi-bot
pkg/workerpool(cdc): fix race between handling error and unregisterin…
79b5af1 
…g handler (#4605) (#4683)

close #4447
ti-chi-bot added a commit that referenced this pull request Jun 16, 2022
@ti-chi-bot
pkg/workerpool(cdc): fix race between handling error and unregisterin…
c6fdb3b 
…g handler (#4605) (#4682)

close #4447
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei approved these changes

@overvenus overvenus overvenus approved these changes

Assignees
No one assigned
Labels
area/ticdc Issues or PRs related to TiCDC. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. 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. status/ptal Could you please take a look? type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

data race when running leak test
4 participants
@liuzix @ti-chi-bot @overvenus @amyangfei