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 bug of run ddl job error but actually take effect (#17341) #17608

Merged
merged 8 commits into from
Jun 5, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 2, 2020

cherry-pick #17341 and #17633 to release-4.0


Signed-off-by: crazycs520 crazycs520@gmail.com

What problem does this PR solve?

Close #17356

When owner run ddl job error, it shouldn't take effect.

What is changed and how it works?

Clean transaction modification when run ddl job error.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • No

Release note

  • Fix an issue that may break the atomicity of DDL job: when a DDL job is retried, the schema is unexpectedly updated.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 2, 2020

/run-all-tests

Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

LGTM

zimulala
zimulala previously approved these changes Jun 3, 2020
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.

LGTM

@crazycs520
Copy link
Contributor

/rebuild

Signed-off-by: crazycs <crazycs520@gmail.com>
zimulala
zimulala previously approved these changes Jun 3, 2020
@crazycs520
Copy link
Contributor

/run-unit-test

@crazycs520
Copy link
Contributor

/run-unit-test

@crazycs520
Copy link
Contributor

/run-all-tests

@crazycs520
Copy link
Contributor

/run-integration-copr-test

@bb7133
Copy link
Member

bb7133 commented Jun 3, 2020

/run-all-tests

@crazycs520
Copy link
Contributor

/run-all-tests

@bb7133 bb7133 merged commit 1a733d0 into pingcap:release-4.0 Jun 5, 2020
@bb7133 bb7133 modified the milestones: v4.0.1, v4.0.2 Jun 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/sql-infra SIG: SQL Infra type/bug-fix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants