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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from Apr 29, 2024
Merged

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

merged 4 commits into from Apr 29, 2024

Conversation

YuJuncen
Copy link
Contributor

@YuJuncen YuJuncen commented Apr 15, 2024 •
edited

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
fix adapt env for snapshot backup stuck when encountered error
5be5a8b 
Signed-off-by: hillium <yu745514916@live.com>
@YuJuncen YuJuncen changed the title fix adapt env for snapshot backup stuck when encountered error br/operator: fix adapt env for snapshot backup stuck when encountered error Apr 15, 2024
@ti-chi-bot ti-chi-bot bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/invalid-title labels Apr 15, 2024
@tiprow tiprow
Copy link

tiprow bot commented Apr 15, 2024

Hi @YuJuncen. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

@codecov Codecov
Copy link

codecov bot commented Apr 15, 2024 •
edited

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.1022%. Comparing base (224ae15) to head (8fd0bf7).
Report is 99 commits behind head on master.

Additional details and impacted files 
@@                Coverage Diff                @@
##             master     #52607         +/-   ##
=================================================
- Coverage   74.3558%   58.1022%   -16.2536%     
=================================================
  Files          1470       1602        +132     
  Lines        354521     621964     +267443     
=================================================
+ Hits         263607     361375      +97768     
- Misses        71638     236939     +165301     
- Partials      19276      23650       +4374
Flag Coverage Δ
integration 39.3365% <100.0000%> (?)
unit 72.5122% <0.0000%> (-0.6150%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9957% <ø> (-2.3014%) ⬇️
parser ∅ <ø> (∅)
br 60.3615% <100.0000%> (+17.7216%) ⬆️

@YuJuncen
added a test csae
9ae80cc 
Signed-off-by: hillium <yu745514916@live.com>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 24, 2024
@YuJuncen
make bazel_prepare
14ddb35 
Signed-off-by: hillium <yujuncen@pingcap.com>
BornChanger
BornChanger reviewed Apr 25, 2024
View reviewed changes
Copy link
Contributor

@BornChanger BornChanger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest lgtm.

@YuJuncen @BornChanger
Update br/pkg/backup/prepare_snap/prepare.go
8fd0bf7 
Co-authored-by: BornChanger <97348524+BornChanger@users.noreply.github.com>
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, Leavrth

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

ti-chi-bot bot commented Apr 29, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-04-25 07:54:38.687412466 +0000 UTC m=+246835.427315379: ☑️ agreed by Leavrth.
  • 2024-04-29 04:42:28.688283718 +0000 UTC m=+245902.445419288: ☑️ agreed by BornChanger.

@ti-chi-bot ti-chi-bot bot merged commit 2969b9e into pingcap:master Apr 29, 2024
30 of 36 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #52969.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 29, 2024
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #52970.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 29, 2024
@YuJuncen @ti-chi-bot
This is an automated cherry-pick of pingcap#52607
1cfc58e 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 29, 2024
Closed
12 tasks
YuJuncen added a commit to YuJuncen/tidb that referenced this pull request May 6, 2024
@YuJuncen
br/operator: fix adapt env for snapshot backup stuck when encountered…
a382435 
… error (pingcap#52607)

close pingcap#52846
ti-chi-bot bot pushed a commit that referenced this pull request May 6, 2024
@ti-chi-bot
br/operator: fix adapt env for snapshot backup stuck when encountered…
9075922 
… error (#52607) (#52969)

close #52846
@YuJuncen YuJuncen mentioned this pull request May 6, 2024
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Leavrth Leavrth Leavrth approved these changes

@BornChanger BornChanger BornChanger approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-6.5 needs-cherry-pick-release-7.5 release-note-none size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

snapshot backup stuck when encountered error
4 participants
@YuJuncen @ti-chi-bot @Leavrth @BornChanger