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

sorter: fix Unified Sorter error handling & add more unit test cases (#1619) #1677

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 16, 2021

cherry-pick #1619 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In ticdc repo:
git pr https://github.com/pingcap/ticdc/pull/1677

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/ticdc.git pr/1677:release-4.0-22774319c392

What problem does this PR solve?

  • Unified Sorter might return an unhelpful error ErrWorkerPoolHandleCancelled for some IO errors.
  • Some error handling code might cause data race.

What is changed and how it works?

  • Filter the ErrWorkerPoolHandleCancelled error.
  • Add appropriate synchronization to avoid races.
  • Add unit test cases for these fixes.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

  • Fix Unified Sorter returning unhelpful error messages & other misc. fixes.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

[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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added component/puller Puller component. status/ptal Could you please take a look? size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 16, 2021
@ti-chi-bot ti-chi-bot requested a review from liuzix April 16, 2021 06:58
@ti-srebot ti-srebot added this to the v4.0.13 milestone Apr 16, 2021
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 16, 2021
@amyangfei amyangfei changed the base branch from release-4.0 to release-4.0-pending April 28, 2021 07:53
@ti-chi-bot
Copy link
Member

@ti-srebot: PR needs rebase.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 28, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 30, 2021
@amyangfei
Copy link
Contributor

cherry-picked in #1730

@amyangfei amyangfei closed this May 6, 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/puller Puller component. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/ptal Could you please take a look? type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants