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

backup: fix retry of fine-grained backup (#43252) #43302

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #43252

What problem does this PR solve?

Issue Number: close #43236

Problem Summary:
We are using the tikv.Backoffer to implement retry. Which isn't so customizable hence we cannot fully control the printed error messages and back off duration.

What is changed and how it works?

This PR added a new structure RetryWithBackoffer to adapt the retry logic with the TiDB backoffer logic, at the same time it has enhanced the error message.
This PR will also increase the max retry time of fine-grained backup. The reason is simple: given it begins the fine-grained backup, there must be some problems in the cluster. We need to be more patient.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fixed a bug that may cause BR report false "resolve lock timeout" error.

@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 do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Apr 22, 2023
@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 22, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 14, 2023
Signed-off-by: hillium <yujuncen@pingcap.com>
@YuJuncen YuJuncen force-pushed the cherry-pick-43252-to-release-6.1 branch from b6e66d0 to 83fa48f Compare June 30, 2023 05:52
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 30, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 30, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-06-30 05:55:59.589679501 +0000 UTC m=+65042.964257351: ☑️ agreed by YuJuncen.
  • 2023-06-30 05:56:54.579471841 +0000 UTC m=+65097.954049691: ☑️ agreed by Leavrth.

@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@YuJuncen
Copy link
Contributor

/retest-required
🤔️

@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
Signed-off-by: hillium <yujuncen@pingcap.com>
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@tonyxuqqi
Copy link

/test

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 30, 2023

@tonyxuqqi: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

Use /test all to run all jobs.

In response to this:

/test

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.

@tonyxuqqi
Copy link

/test mysql-test

@tiprow
Copy link

tiprow bot commented Jun 30, 2023

@tonyxuqqi: No presubmit jobs available for pingcap/tidb@release-6.1

In response to this:

/test

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.

@tiprow
Copy link

tiprow bot commented Jun 30, 2023

@tonyxuqqi: No presubmit jobs available for pingcap/tidb@release-6.1

In response to this:

/test mysql-test

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.

@tonyxuqqi
Copy link

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 30, 2023

@tonyxuqqi: We have migrated to builtin LGTM and approve plugins for reviewing.

Please use /approve when you want approve this pull request.

The changes announcement: LGTM plugin changes

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.

@tonyxuqqi
Copy link

/approve

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3pointer, Leavrth, tonyxuqqi, YuJuncen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [3pointer,Leavrth,YuJuncen]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@Benjamin2037
Copy link
Collaborator

/retest

@ti-chi-bot ti-chi-bot bot merged commit efc5387 into pingcap:release-6.1 Jun 30, 2023
0 of 3 checks passed
@ti-chi-bot ti-chi-bot added cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. labels Jul 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants