Skip to content

ddl: fix recover table by JobID bug when JobID is set to 0 tidb-server panic (#46343)#48084

Closed
ti-chi-bot wants to merge 1 commit intopingcap:release-6.1from
ti-chi-bot:cherry-pick-46343-to-release-6.1
Closed

ddl: fix recover table by JobID bug when JobID is set to 0 tidb-server panic (#46343)#48084
ti-chi-bot wants to merge 1 commit intopingcap:release-6.1from
ti-chi-bot:cherry-pick-46343-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Oct 30, 2023

This is an automated cherry-pick of #46343

What problem does this PR solve?

Issue Number: close #46296

Problem Summary:

The "RECOVER TABLE BY JOB 0":

  1. parser will return no error, jobID set to 0 is allowed
  2. when jobID is 0, function executeRecoverTable treat is as "Recover table tableName"，then call getRecoverTableByTableName, How ever Table is nil.

tidb/executor/ddl.go

Lines 396 to 400 in 8d0fdef

if s.JobID != 0 {
job, tblInfo, err = e.getRecoverTableByJobID(s, dom)
} else {
job, tblInfo, err = e.getRecoverTableByTableName(s.Table)
}

What is changed and how it works?

sql1： RECOVER TABLE BY JOB 0
sql2： RECOVER TABLE tableName

The both case paser will set JobID to 0, so can't distinguish them by JobID.
Change it by Table info, if it is not nil, it is sql2, else sql1.
case Table is nil and JobID is 0 is impossible.

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

@jiyfhust @ti-chi-bot
This is an automated cherry-pick of pingcap#46343
17bb4b3 
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-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Oct 30, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 30, 2023
Merged
12 tasks
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 30, 2023

This cherry pick PR is for a release branch and has not yet been approved by triage owners.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.
Details

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.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 30, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign shenli for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Details 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 added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 30, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Feb 6, 2024

@ti-chi-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/check_dev 17bb4b3 link true /test check-dev
idc-jenkins-ci-tidb/check_dev_2 17bb4b3 link true /test check-dev2
idc-jenkins-ci-tidb/build 17bb4b3 link true /test build
idc-jenkins-ci-tidb/mysql-test 17bb4b3 link true /test mysql-test
idc-jenkins-ci-tidb/unit-test 17bb4b3 link true /test unit-test

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@ti-chi-bot ti-chi-bot closed this Jun 13, 2025
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jun 13, 2025

This pull request is closed because its related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

https://prow.tidb.net/command-help#cherrypick
https://book.prow.tidb.net/#/plugins/cherrypicker

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

Reviewers

No reviews

Assignees

@jiyfhust jiyfhust

Labels

do-not-merge/cherry-pick-not-approved ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ti-chi-bot @jiyfhust