ddl: fix ddl hang over when it meets panic in cancelling path#23204
Merged
ti-chi-bot merged 18 commits intopingcap:masterfrom Mar 13, 2021
Merged
ddl: fix ddl hang over when it meets panic in cancelling path#23204ti-chi-bot merged 18 commits intopingcap:masterfrom
ti-chi-bot merged 18 commits intopingcap:masterfrom
Conversation
Member
|
/lgtm |
zimulala
reviewed
Mar 10, 2021
zimulala
reviewed
Mar 10, 2021
Signed-off-by: ailinkid <314806019@qq.com>
Signed-off-by: ailinkid <314806019@qq.com>
e65d4fb to
7a48c9d
Compare
Contributor
Author
|
/merge |
zimulala
requested changes
Mar 11, 2021
zimulala
reviewed
Mar 11, 2021
zimulala
reviewed
Mar 12, 2021
ddl/ddl_worker.go
Outdated
| // If job is cancelled, we shouldn't return an error and shouldn't load DDL variables. | ||
| if job.State == model.JobStateCancelled { | ||
| logutil.Logger(w.logCtx).Info("[ddl] DDL job is cancelled normally", zap.Error(err)) | ||
| err = nil |
Contributor
There was a problem hiding this comment.
It seems that we should return here directly.
Contributor
|
/LGTM |
zimulala
approved these changes
Mar 12, 2021
Contributor
|
/lgtm |
Member
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. DetailsReviewer can indicate their review by writing |
Contributor
Author
|
/merge |
Member
|
This pull request has been accepted and is ready to merge. DetailsCommit hash: 19abb34 |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Mar 13, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Contributor
|
cherry pick to release-4.0 in PR #23297 |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Mar 13, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Contributor
|
cherry pick to release-5.0-rc in PR #23298 |
ti-chi-bot
pushed a commit
that referenced
this pull request
Mar 16, 2021
ti-chi-bot
pushed a commit
that referenced
this pull request
Mar 17, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: ailinkid 314806019@qq.com
What problem does this PR solve?
Issue Number: close #23202
What is changed and how it works?
What's Changed:
record the error count when the goroutine restored from panic.
Check List
Tests
Release note