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

snap_restore: added retry for recovery (#46094) #46224

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #46094

What problem does this PR solve?

Issue Number: close #46181

Problem Summary:
Now, when TiKV reboots, it is possible to abort the whole restore procedure.

This PR has also introduced a new interface for retrying, WithRetryV2, which supports returned value and move the closure to be retried last of the arguments. (So the code will probably be more readable, comparing WithRetry(ctx, backoffer, func() { /* multi lines */ }) and WithRetry(ctx, func() { /* multi lines */ }, backoffer).

What is changed and how it works?

This PR added retry to the RecoverData call.

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.

Make snapshot restoration more robust.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added 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.5 This PR is cherry-picked to release-6.5 from a source PR. labels Aug 18, 2023
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 18, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 18, 2023
Signed-off-by: hillium <yujuncen@pingcap.com>
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 18, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, 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:

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
Copy link

ti-chi-bot bot commented Aug 18, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-18 05:54:59.64506586 +0000 UTC m=+869664.194081832: ☑️ agreed by BornChanger.
  • 2023-08-18 06:09:24.206716704 +0000 UTC m=+870528.755732690: ☑️ agreed by YuJuncen.

@ti-chi-bot ti-chi-bot bot added the approved label Aug 18, 2023
@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #46224   +/-   ##
================================================
  Coverage               ?   73.6701%           
================================================
  Files                  ?       1084           
  Lines                  ?     347978           
  Branches               ?          0           
================================================
  Hits                   ?     256356           
  Misses                 ?      75163           
  Partials               ?      16459           

@ti-chi-bot ti-chi-bot bot merged commit 526530b into pingcap:release-6.5 Aug 18, 2023
6 checks passed
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.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants