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: add a new retry to support the error isRetryable or not (#1848) #2159

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1848

What problem does this PR solve?

  • intention is try to solve Fail-fast for unrecoverable DML errors Fail-fast for unrecoverable DML errors #1724, for now add a new retry pkg, will try to replace the current retry usage later
  • add functional options feature to better support extend the retry ability
  • return ctx.Error() when got canceled instead of just return err, for more detail check Give reason for Stop cenkalti/backoff#97
  • support RunWithInfiniteRetry and RunSpecificTimesRetry in one func with WithInfiniteTries, WithMaxTries Option
  • change the param from WithMaxRetries to WithMaxTries for better understanding
        just paste some comments from test

        err := Run(500*time.Millisecond, 3, f)
	c.Assert(err, check.ErrorMatches, "test")
	// It's weird that backoff may retry one more time than maxTries.
	// Because the steps in backoff.Retry is:
	// 1. Call function
	// 2. Compare numTries and maxTries
	// 3. Increment numTries
	c.Assert(callCount, check.Equals, 3+1)

What is changed and how it works?

add a new implementation of retry to support config error retry or not

Check List

Tests

  • Unit test

Code changes

  • Has new function added

Related changes

  • Need to cherry-pick to the release branch

Release note

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved The current cherry-pick pull request has not been approved and cannot be merged. status/ptal Could you please take a look? size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR. labels Jun 25, 2021
@ti-chi-bot
Copy link
Member Author

@ben1009: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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.

@ben1009
Copy link
Contributor

ben1009 commented Jun 28, 2021

/run-integration-tests

@ben1009
Copy link
Contributor

ben1009 commented Jun 28, 2021

/run-kafka-tests

@ben1009
Copy link
Contributor

ben1009 commented Jun 29, 2021

/run-integration-tests

@codecov-commenter
Copy link

codecov-commenter commented Jun 29, 2021

Codecov Report

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

@@               Coverage Diff                @@
##             release-5.1      #2159   +/-   ##
================================================
  Coverage               ?   56.0030%           
================================================
  Files                  ?        166           
  Lines                  ?      19815           
  Branches               ?          0           
================================================
  Hits                   ?      11097           
  Misses                 ?       7644           
  Partials               ?       1074           

@amyangfei amyangfei added this to the v5.1.1 milestone Jul 5, 2021
@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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@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 Jul 14, 2021
@ben1009
Copy link
Contributor

ben1009 commented Jul 14, 2021

/run-all-tests

@ben1009
Copy link
Contributor

ben1009 commented Jul 14, 2021

/run-kafka-tests

@ben1009
Copy link
Contributor

ben1009 commented Jul 14, 2021

/run-integration-tests

@lonng lonng added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved The current cherry-pick pull request has not been approved and cannot be merged. labels Jul 14, 2021
@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: ab2b2f7

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 14, 2021
@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.

@ti-chi-bot ti-chi-bot merged commit d435a68 into pingcap:release-5.1 Jul 14, 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. size/XL Denotes a PR that changes 500-999 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/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants