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

util/admin: fix the error of "invalid list index" when cancel ddl jobs (#12402) #12671

Merged
merged 2 commits into from
Oct 13, 2019
Merged

util/admin: fix the error of "invalid list index" when cancel ddl jobs (#12402) #12671

merged 2 commits into from
Oct 13, 2019

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Oct 13, 2019

cherry-pick #12402 to release-3.0

What problem does this PR solve?

When both types of jobs exist in the DDL queue, we cancel the job with a larger ID. Then we may get the error of [structure:4]invalid list index

session1: alter table t add index idx(a);   --- job ID: 1
session2: alter table t drop index idx;     --- job ID: 2
session3: admin cancel ddl jobs 2;         --- [structure:4]invalid list index 1

What is changed and how it works?

Make the offset in UpdateDDLJob is correct.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

  • Write release note for bug-fix or new feature.

@sre-bot
Copy link
Contributor Author

sre-bot commented Oct 13, 2019

/run-all-tests

@sre-bot sre-bot mentioned this pull request Oct 13, 2019
Merged
@sre-bot sre-bot added sig/execution SIG execution type/3.0 cherry-pick type/bugfix This PR fixes a bug. labels Oct 13, 2019
winkyao
winkyao reviewed Oct 13, 2019
View reviewed changes
Copy link
Contributor

@winkyao winkyao left a comment

Choose a reason for hiding this comment

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

LGTM

zz-jason
zz-jason approved these changes Oct 13, 2019
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. labels Oct 13, 2019
@sre-bot
Copy link
Contributor Author

sre-bot commented Oct 13, 2019

Your auto merge job has been accepted, waiting for 12566, 12404, 12602

@sre-bot
Copy link
Contributor Author

sre-bot commented Oct 13, 2019

/run-all-tests

@sre-bot sre-bot merged commit 6f8e1ab into pingcap:release-3.0 Oct 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@winkyao winkyao winkyao left review comments

@zz-jason zz-jason zz-jason approved these changes

@crazycs520 crazycs520 Awaiting requested review from crazycs520

@lonng lonng Awaiting requested review from lonng

Assignees
No one assigned
Labels
sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sre-bot @zz-jason @winkyao @zimulala