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

etcd/client(ticdc): add retry operation for etcd transaction api (#4248) (#4474) #4533

Merged
merged 5 commits into from
Apr 28, 2022
Merged

etcd/client(ticdc): add retry operation for etcd transaction api (#4248) (#4474) #4533

merged 5 commits into from
Apr 28, 2022

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Feb 8, 2022 •
edited by CharlesCheung96
Loading

This is an cherry-pick of #4219, #4199, #4474, #4788

What problem does this PR solve?

Issue Number: close #4248, #2899, #2901, #2902, #4200, #4778

What is changed and how it works?

  1. Add retry strategy for etcd transaction, which uniformly handles errors related to etcd transactions and only throws errors that are not retryable, such as context.Canceled, context.DeadlineExceeded, errors.ErrReachMaxTry.
  2. Catch all of the EtcdError in the etcd_worker and retry the Txn operation again to prevent the cdc process from exiting abnormally.
  3. When the connection between cdc and etcd is abnormal, session will be responsible for disconnecting and throwing ErrEtcdSessionDone error, which causes the capture to automatically recover after suicide.

Check List

Tests

  • Unit test

Code changes

  • Has exported function/method change
  • Has exported variable/fields change

Side effects

  • Possible performance regression
  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch

Release note 

Fix a bug that owner exits abnormally when PD leader is killed

@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 mentioned this pull request Feb 8, 2022
Merged
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. component/owner Owner component. size/L Denotes a PR that changes 100-499 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.4 This PR is cherry-picked to release-5.4 from a source PR. labels Feb 8, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 9, 2022
@amyangfei amyangfei added this to the v5.4.0 milestone Feb 9, 2022
@VelocityLight VelocityLight removed the cherry-pick-approved Cherry pick PR approved by release team. label Feb 9, 2022
@amyangfei
Copy link
Contributor

Please resolve conflicts @CharlesCheung96

@CharlesCheung96 CharlesCheung96 force-pushed the cherry-pick-4474-to-release-5.4 branch from f0e52f1 to 93110ac Compare February 16, 2022 08:52
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 16, 2022
@CharlesCheung96 CharlesCheung96 force-pushed the cherry-pick-4474-to-release-5.4 branch from 93110ac to 14b8656 Compare February 17, 2022 03:20
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@CharlesCheung96
Copy link
Contributor

/run-leak-test
/run-dm-integration-tests

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 19, 2022
@CharlesCheung96 CharlesCheung96 force-pushed the cherry-pick-4474-to-release-5.4 branch from 14b8656 to 519e5f8 Compare February 24, 2022 04:00
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 24, 2022
@CharlesCheung96
Copy link
Contributor

@VelocityLight

@CharlesCheung96
Copy link
Contributor

/run-all-tests

@overvenus overvenus modified the milestones: v5.4.0, v5.4.1 Mar 12, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 20, 2022
@pingcap pingcap deleted a comment from ti-chi-bot Apr 22, 2022
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@CharlesCheung96 CharlesCheung96 mentioned this pull request Apr 22, 2022
Closed
@CharlesCheung96
Copy link
Contributor

/run-all-tests

1 similar comment
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 9595058

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 28, 2022
@CharlesCheung96 CharlesCheung96 force-pushed the cherry-pick-4474-to-release-5.4 branch from 9595058 to 06db40b Compare April 28, 2022 02:47
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 28, 2022
@CharlesCheung96
Copy link
Contributor

/run-all-tests

@CharlesCheung96
Copy link
Contributor

/run-unit-test

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 06db40b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 28, 2022
@CharlesCheung96
Copy link
Contributor

/run-leak-test
/run-dm-integration-test

@CharlesCheung96
Copy link
Contributor

/run-leak-test

@CharlesCheung96
Copy link
Contributor

/run-all-tests

@CharlesCheung96
Copy link
Contributor

/run-verify
/run-kafka-integration-tests

@CharlesCheung96
Copy link
Contributor

/run-kafka-integration-tests

@CharlesCheung96 CharlesCheung96 merged commit 8e5b95e into pingcap:release-5.4 Apr 28, 2022
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

Assignees

@CharlesCheung96 CharlesCheung96

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/owner Owner component. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ 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.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Milestone
v5.4.1
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @amyangfei @CharlesCheung96 @overvenus @VelocityLight @zhaoxinyu