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

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

Merged

Conversation

ti-chi-bot
Copy link
Member

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

@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.5 This PR is cherry-picked to release-6.5 from a source PR. labels Oct 30, 2023
Copy link
Collaborator

@Benjamin2037 Benjamin2037 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 20, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 23, 2023
@Benjamin2037
Copy link
Collaborator

/retest

Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added the lgtm label Nov 24, 2023
Copy link

ti-chi-bot bot commented Nov 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, GMHDBJD

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 bot added approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 24, 2023
Copy link

ti-chi-bot bot commented Nov 24, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-20 08:19:04.511688307 +0000 UTC m=+219573.176914501: ☑️ agreed by Benjamin2037.
  • 2023-11-24 02:05:35.181592129 +0000 UTC m=+542763.846818326: ☑️ agreed by GMHDBJD.

Copy link

codecov bot commented Nov 24, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@02d7703). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #48085   +/-   ##
================================================
  Coverage               ?   73.6360%           
================================================
  Files                  ?       1086           
  Lines                  ?     349113           
  Branches               ?          0           
================================================
  Hits                   ?     257073           
  Misses                 ?      75549           
  Partials               ?      16491           

@ti-chi-bot ti-chi-bot bot merged commit 99e82e3 into pingcap:release-6.5 Nov 24, 2023
10 checks passed
@Benjamin2037 Benjamin2037 deleted the cherry-pick-46343-to-release-6.5 branch November 24, 2023 02:59
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 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.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.

4 participants