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

ddl: fix a bug that upgrade the node when there is a paused job. #44231

Merged
merged 5 commits into from
May 29, 2023
Merged

ddl: fix a bug that upgrade the node when there is a paused job. #44231

merged 5 commits into from
May 29, 2023

Conversation

zimulala
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #44225

Problem Summary:
Before the upgrade, it has a paused DDL job, it's upgrade will fail

What is changed and how it works?

  • Update judgment condition
  • Move the callback from ddl/internal to ddl/util(Use it in test).

Check List

Tests

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

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

@zimulala zimulala requested a review from a team as a code owner May 29, 2023 04:10
@ti-chi-bot
Copy link

ti-chi-bot bot commented May 29, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • tangenta

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 bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 29, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 29, 2023
@zimulala
Copy link
Contributor Author

/retest

@pingcap pingcap deleted a comment from ti-chi-bot bot May 29, 2023
Defined2014
Defined2014 reviewed May 29, 2023
View reviewed changes
session/bootstraptest/bootstrap_upgrade_test.go
suc = true
break
}
time.Sleep(time.Millisecond * 200)
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it will cause UT too slow?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In theory, no more than one retry is required to succeed. However, CI environment issues may require multiple retries just to stabilize the test, so multiple retries are added

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 29, 2023
hawkingrei added 2 commits May 29, 2023 14:42
@hawkingrei
update
1a7add3 
Signed-off-by: Weizhen Wang <[email protected]>
@hawkingrei
update
a80a238 
Signed-off-by: Weizhen Wang <[email protected]>
@zimulala
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 29, 2023

This pull request has been accepted and is ready to merge.

Commit hash: a80a238

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 29, 2023
@ti-chi-bot ti-chi-bot bot merged commit 65959f3 into pingcap:master May 29, 2023
@zimulala zimulala deleted the zimuxia/bug-fix branch May 29, 2023 08:37
@zimulala zimulala added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label May 29, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request May 29, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request May 29, 2023
@zimulala @ti-chi-bot
This is an automated cherry-pick of pingcap#44231
4e2fde2 
Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot bot pushed a commit that referenced this pull request Jul 12, 2023
@ti-chi-bot
ddl: fix a bug that upgrade the node when there is a paused job. (#44231
541cd53 
) (#44242)

close #44225
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tangenta tangenta tangenta approved these changes

@Defined2014 Defined2014 Defined2014 approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Before the upgrade, it has a paused DDL job, it's upgrade will fail
6 participants
@zimulala @ti-chi-bot @XuHuaiyu @Defined2014 @tangenta @hawkingrei