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

br/operator: fix adapt env for snapshot backup stuck when encountered error (#52607) #52969

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #52607

What problem does this PR solve?

Issue Number: close #52846

Problem Summary:
When we failed to prepare the connections for wait apply, the channel may never be closed. Hence the pause PD operation (which relies on the finishing of the prepare connections stage) get stuck.

What changed and how does it work?

Selected over the context so it can be canceled.

Check List

Tests

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

    The change is almost trivial.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

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

None

YuJuncen and others added 4 commits April 29, 2024 06:09
Signed-off-by: hillium <yu745514916@live.com>
Signed-off-by: hillium <yu745514916@live.com>
Signed-off-by: hillium <yujuncen@pingcap.com>
Co-authored-by: BornChanger <97348524+BornChanger@users.noreply.github.com>
@ti-chi-bot ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Apr 29, 2024
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 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 Apr 29, 2024
Copy link

codecov bot commented Apr 29, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (release-6.5@727a2c7). Click here to learn what that means.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #52969   +/-   ##
================================================
  Coverage               ?   73.6439%           
================================================
  Files                  ?       1096           
  Lines                  ?     351581           
  Branches               ?          0           
================================================
  Hits                   ?     258918           
  Misses                 ?      76014           
  Partials               ?      16649           

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label May 6, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label May 6, 2024
Copy link

ti-chi-bot bot commented May 6, 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

Copy link

ti-chi-bot bot commented May 6, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-05-06 06:51:59.240346472 +0000 UTC m=+858472.997482046: ☑️ agreed by BornChanger.
  • 2024-05-06 06:52:57.441486579 +0000 UTC m=+858531.198622137: ☑️ agreed by YuJuncen.

@ti-chi-bot ti-chi-bot bot merged commit 9075922 into pingcap:release-6.5 May 6, 2024
28 checks passed
mittalrishabh pushed a commit to mittalrishabh/tidb that referenced this pull request May 30, 2024
… error (pingcap#52607) (pingcap#52969) (pingcap#88)

close pingcap#52846

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 release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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