Skip to content

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

Merged
ti-chi-bot[bot] merged 1 commit intopingcap:release-7.5from
ti-chi-bot:cherry-pick-46343-to-release-7.5
Feb 20, 2024
Merged

ddl: fix recover table by JobID bug when JobID is set to 0 tidb-server panic (#46343)#48087
ti-chi-bot[bot] merged 1 commit intopingcap:release-7.5from
ti-chi-bot:cherry-pick-46343-to-release-7.5

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

@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-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Oct 30, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 30, 2023
Merged
12 tasks
@jiyfhust
Copy link
Contributor

jiyfhust commented Dec 12, 2023

/approve

@codecov
Copy link

codecov bot commented Feb 9, 2024 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-7.5@0d8177f). Click here to learn what that means.
The diff coverage is 100.0000%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-7.5     #48087   +/-   ##
================================================
  Coverage               ?   73.6771%           
================================================
  Files                  ?       1404           
  Lines                  ?     420444           
  Branches               ?          0           
================================================
  Hits                   ?     309771           
  Misses                 ?      91404           
  Partials               ?      19269
Flag Coverage Δ
unit 73.6771% <100.0000%> (?)

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

Components Coverage Δ
dumpling 53.9913% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.6649% <0.0000%> (?)

Benjamin2037
Benjamin2037 approved these changes Feb 19, 2024
View reviewed changes
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 Feb 19, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 19, 2024
@ti-chi-bot
Copy link

ti-chi-bot bot commented Feb 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, jiyfhust, tangenta

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

The pull request process is described 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 approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 20, 2024
@ti-chi-bot
Copy link

ti-chi-bot bot commented Feb 20, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-19 13:23:40.569680599 +0000 UTC m=+277109.317303711: ☑️ agreed by Benjamin2037.
  • 2024-02-20 05:59:57.428576962 +0000 UTC m=+336886.176200074: ☑️ agreed by tangenta.

@Benjamin2037
Copy link
Collaborator

Benjamin2037 commented Feb 20, 2024

/retest

1 similar comment
@Benjamin2037
Copy link
Collaborator

Benjamin2037 commented Feb 20, 2024

/retest

@wuhuizuo
Copy link
Contributor

wuhuizuo commented Feb 20, 2024

/hold
wait for merging of #51164

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024
@wuhuizuo
Copy link
Contributor

wuhuizuo commented Feb 20, 2024

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024
@wuhuizuo
Copy link
Contributor

wuhuizuo commented Feb 20, 2024

flaky case:
image
https://do.pingcap.net/jenkins/blue/organizations/jenkins/pingcap%2Ftidb%2Frelease-7.5%2Fghpr_unit_test/detail/ghpr_unit_test/560/pipeline
https://do.pingcap.net/jenkins/blue/organizations/jenkins/pingcap%2Ftidb%2Frelease-7.5%2Fghpr_unit_test/detail/ghpr_unit_test/559/pipeline

@wuhuizuo
Copy link
Contributor

wuhuizuo commented Feb 20, 2024

/retest

@ti-chi-bot ti-chi-bot bot merged commit 19637a3 into pingcap:release-7.5 Feb 20, 2024
@ti-chi-bot ti-chi-bot deleted the cherry-pick-46343-to-release-7.5 branch April 15, 2025 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

@tangenta tangenta tangenta approved these changes

Assignees

@jiyfhust jiyfhust

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-7.5 This PR is cherry-picked to release-7.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @jiyfhust @Benjamin2037 @wuhuizuo @tangenta