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: Ignore ddl jobs with empty query or blacklist type when exec restore #33384

Merged
merged 9 commits into from
Mar 28, 2022
Merged

br: Ignore ddl jobs with empty query or blacklist type when exec restore #33384

merged 9 commits into from
Mar 28, 2022

Conversation

WangLe1321
Copy link
Contributor

@WangLe1321 WangLe1321 commented Mar 24, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #33322

Problem Summary: Sometimes, query of ddl job can be empty, which will cause error when execute incremental restore.

What is changed and how it works?

During backup, when we find ddl job with action types about TiFlash or lock/unlock table, we will set the query empty. So we add an action type blacklist, ddl job with action type in blacklist will be ignored. We also ignore ddl job with empty query in case other unexpected situation.

This means that we will ignore ddl jobs about TiFlash or lock/unlock table and ddl jobs with empty query, so they won't cause error by mistake.

Check List

  • Unit test

Release note

Fix a bug that BR incremental restore return error by mistake caused by ddl job with empty query.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 24, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • joccau

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 added needs-cherry-pick-4.0 release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 24, 2022
@CLAassistant
Copy link

CLAassistant commented Mar 24, 2022 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@WangLe1321 WangLe1321 changed the title b r: ignore ddl jobs with empty query or blacklist type when exec res… br: ignore ddl jobs with empty query or blacklist type when exec restore Mar 24, 2022
@WangLe1321 WangLe1321 changed the title br: ignore ddl jobs with empty query or blacklist type when exec restore br: Ignore ddl jobs with empty query or blacklist type when exec restore Mar 24, 2022
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Mar 24, 2022
@WangLe1321
Copy link
Contributor Author

/cc @joccau

@ti-chi-bot ti-chi-bot requested a review from joccau March 24, 2022 07:34
@WangLe1321
Copy link
Contributor Author

/cc @3pointer

@sre-bot
Copy link
Contributor

sre-bot commented Mar 24, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/4e4dfb2fade0a230143fc9528b21eb1c58790eb6

@joccau
Copy link
Member

joccau commented Mar 24, 2022

/component br

@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label Mar 24, 2022
@joccau
Copy link
Member

joccau commented Mar 24, 2022

/run-integration-br-test

@joccau
Copy link
Member

joccau commented Mar 24, 2022

/run-integration-br-test

@joccau
Copy link
Member

joccau commented Mar 24, 2022

/run-unit-test

@WangLe1321
Copy link
Contributor Author

/run-integration-br-test

1 similar comment
@WangLe1321
Copy link
Contributor Author

/run-integration-br-test

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2022
@ti-chi-bot ti-chi-bot merged commit 11db011 into pingcap:master Mar 28, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-4.0
c8f91c2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Closed
1 task
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #33511

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-5.0
3e11874 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Closed
1 task
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #33513

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-5.1
6bff10a 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Closed
1 task
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #33514

@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Closed
1 task
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-5.2
83dc4e1 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #33515

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-5.3
bc7db1f 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Merged
1 task
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #33516

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-5.4
8f7f248 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Merged
1 task
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #33517

@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Closed
1 task
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 28, 2022
@WangLe1321 @ti-srebot
cherry pick pingcap#33384 to release-6.0
f377878 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #33518

@WangLe1321 WangLe1321 mentioned this pull request Apr 2, 2022
Closed
WangLe1321 added a commit to ti-srebot/tidb that referenced this pull request Apr 28, 2022
@WangLe1321
cherry pick pingcap#33384 to release-5.4
52b4e72 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-chi-bot pushed a commit that referenced this pull request Apr 28, 2022
@ti-srebot
br: Ignore ddl jobs with empty query or blacklist type when exec rest…
3f7c341 
…ore (#33384) (#33517)

close #33322
ti-chi-bot pushed a commit that referenced this pull request Jun 16, 2022
@ti-srebot
br: Ignore ddl jobs with empty query or blacklist type when exec rest…
a81f53b 
…ore (#33384) (#33516)

close #33322
@joccau joccau mentioned this pull request Dec 13, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joccau joccau joccau approved these changes

@3pointer 3pointer 3pointer approved these changes

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. 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. 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.

incremental restore doesn't empty query job.
8 participants
@WangLe1321 @ti-chi-bot @CLAassistant @sre-bot @joccau @fengou1 @3pointer @ti-srebot