Skip to content

executor: fix admin show job panic when upgrade from v4.0 to v6.4#39067

Merged
ti-chi-bot merged 4 commits intopingcap:masterfrom
tangenta:fix-admin-show-panic
Nov 10, 2022
Merged

executor: fix admin show job panic when upgrade from v4.0 to v6.4#39067
ti-chi-bot merged 4 commits intopingcap:masterfrom
tangenta:fix-admin-show-panic

Conversation

@tangenta
Copy link
Contributor

@tangenta tangenta commented Nov 10, 2022

What problem does this PR solve?

Issue Number: close #38980

Problem Summary:

For the add index jobs from TiDB v4.0, it is possible to have job.ReorgMeta to be nil.

What is changed and how it works?

Check if job.ReorgMeta is nil before using it.

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
Copy link
Member

ti-chi-bot commented Nov 10, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • crazycs520
  • wjhuang2016

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.

Details

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-cherry-pick-release-6.4 and removed do-not-merge/needs-triage-completed labels Nov 10, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 10, 2022
zimulala
zimulala reviewed Nov 10, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

Do you have a test(Manual test) for this code?

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 10, 2022
@tangenta
Copy link
Contributor Author

tangenta commented Nov 10, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 10, 2022

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

DetailsCommit hash: ccab286

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 10, 2022
@ti-chi-bot ti-chi-bot merged commit f5171e3 into pingcap:master Nov 10, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 10, 2022
Closed
12 tasks
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 10, 2022

In response to a cherrypick label: new pull request created: #39074.

@sre-bot
Copy link
Contributor

sre-bot commented Nov 10, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 1, success 5, total 6 44 min Existing failure
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 11 min Existing failure
idc-jenkins-ci/integration-cdc-test ✅ all 39 tests passed 21 min Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 8 min 56 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 46 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 45 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 4 min 22 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 8 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

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

Reviewers

@zimulala zimulala zimulala left review comments

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

@crazycs520 crazycs520 crazycs520 approved these changes

Assignees

No one assigned

Labels

release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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.

upgrade tidb from 4.0.16 to 6.4.0, admin show ddl jobs paniced

6 participants

@tangenta @ti-chi-bot @sre-bot @zimulala @wjhuang2016 @crazycs520