ddl: fix the covert job to rollingback job #23903
Merged
Conversation
This file contains 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
Signed-off-by: AilinKid <314806019@qq.com>
ti-chi-bot
added
the
size/L
Signed-off-by: AilinKid <314806019@qq.com>
AilinKid
requested review from
zimulala,
crazycs520 and
tangenta
and removed request for
zimulala
zimulala
reviewed
Apr 14, 2021
ddl/rollingback.go
Outdated
| } | ||
| errorCount := variable.GetDDLErrorCountLimit() | ||
| if job.ErrorCount > errorCount { | ||
| msg := fmt.Sprintf("job being converted to rollback job errors and error count beyond the limitation %d, cancelled", errorCount) |
There was a problem hiding this comment.
Suggested change
| msg := fmt.Sprintf("job being converted to rollback job errors and error count beyond the limitation %d, cancelled", errorCount) | |
| logutil.Logger(w.logCtx).Warn("[ddl] rollback DDL job error count exceed the limit, cancelled it now", zap.Int64("jobID", job.ID), zap.Int64("errorCountLimit", errorCount)) |
Unify the logs in runDDL and this function.
Signed-off-by: AilinKid <314806019@qq.com>
tangenta
reviewed
Apr 15, 2021
tangenta
reviewed
Apr 15, 2021
ddl/rollingback.go
Outdated
| errorCount := variable.GetDDLErrorCountLimit() | ||
| if job.ErrorCount > errorCount { | ||
| logutil.Logger(w.logCtx).Warn("[ddl] rollback DDL job error count exceed the limit, cancelled it now", zap.Int64("jobID", job.ID), zap.Int64("errorCountLimit", errorCount)) | ||
| job.Error = toTError(errors.New(fmt.Sprintf(fmt.Sprintf(" rollback DDL job error count exceed the limit %d, cancelled it now", errorCount)))) |
There was a problem hiding this comment.
Suggested change
| job.Error = toTError(errors.New(fmt.Sprintf(fmt.Sprintf(" rollback DDL job error count exceed the limit %d, cancelled it now", errorCount)))) | |
| job.Error = toTError(errors.New(fmt.Sprintf(fmt.Sprintf("rollback DDL job error count exceed the limit %d, cancelled it now", errorCount)))) |
Signed-off-by: AilinKid <314806019@qq.com>
|
/lgtm |
zimulala
reviewed
Apr 15, 2021
zimulala
reviewed
Apr 15, 2021
|
/lgtm |
|
[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. Reviewer can indicate their review by writing |
ti-chi-bot
added
status/LGT2
|
/approve |
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 0d3e800
|
ti-chi-bot
added
the
status/can-merge
|
/merge |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Apr 16, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-5.0 in PR #24080 |
ti-chi-bot
pushed a commit
that referenced
this pull request
Apr 16, 2021
|
/run-cherry-picker |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
May 7, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-4.0 in PR #24445 |
ti-chi-bot
pushed a commit
that referenced
this pull request
May 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #23893
Once
convertJob2RollbackJobmeets error, the job state can't be set asJobStateRollingbacksincejob state and args may not be correctly overwritten. The job will be fetched to run with the canceling
state again. So we should check the error count here.
What is changed and how it works?
What's Changed:
change all the rollingback assignments to the last step in all ddl canceling logic.
This is aim to get rid of invalid job state and job args, while the job is assigned with rollingback state, which will lead errors in following rollingback logic, for example, json unmarshal error.
Add error count check and force it be canceled in convertJob2RollbackJob
This is aim to get rid of the infinite loop of canceling action once
convertJob2RollbackJobgets an error.Related changes
pingcap/docs/pingcap/docs-cn:Check List
Tests
Release note