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

ebs_br: allow temporary TiKV unreachable during starting snapshot backup (#49154) #50444

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #49154

What problem does this PR solve?

Issue Number: close #49152, close #49153

Problem Summary:
See the issue.
For #49152, we didn't add retry for starting suspending lightning.
For #49153, we just break the loop when keeper encounters errors, this may cause the final consistency check passes because of the request of extend lease.

What changed and how does it work?

Fixed the problems above by retry and fail fast.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Release note

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

Fixed a bug that may cause EBS snapshot backup not work properly with TiKV outage.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 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 Jan 15, 2024
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 15, 2024
Signed-off-by: hillium <yujuncen@pingcap.com>
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 16, 2024
Signed-off-by: hillium <yujuncen@pingcap.com>
@YuJuncen
Copy link
Contributor

/retest-required

Signed-off-by: hillium <yujuncen@pingcap.com>
Signed-off-by: hillium <yujuncen@pingcap.com>
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jan 17, 2024
Copy link

codecov bot commented Jan 17, 2024

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #50444   +/-   ##
================================================
  Coverage               ?   73.6541%           
================================================
  Files                  ?       1090           
  Lines                  ?     349960           
  Branches               ?          0           
================================================
  Hits                   ?     257760           
  Misses                 ?      75648           
  Partials               ?      16552           

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 17, 2024
@ti-chi-bot ti-chi-bot bot added the lgtm label Jan 17, 2024
Copy link

ti-chi-bot bot commented Jan 17, 2024

[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 ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jan 17, 2024
Copy link

ti-chi-bot bot commented Jan 17, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-17 07:10:44.644492573 +0000 UTC m=+339886.208790279: ☑️ agreed by YuJuncen.
  • 2024-01-17 11:58:41.258499848 +0000 UTC m=+357162.822797537: ☑️ agreed by BornChanger.

@BornChanger
Copy link
Contributor

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2024
@BornChanger
Copy link
Contributor

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2024
@ti-chi-bot ti-chi-bot bot merged commit 021a4e3 into pingcap:release-6.5 Jan 17, 2024
28 checks passed
guoshouyan pushed a commit to guoshouyan/tidb that referenced this pull request Mar 5, 2024
…kup (pingcap#49154) (pingcap#50444) (pingcap#37)

close pingcap#49152, close pingcap#49153

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
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 ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 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