From b0ce4131ce67c39a41d3d20df9d888fe9bc5a650 Mon Sep 17 00:00:00 2001 From: Lynn Date: Wed, 29 Apr 2020 23:08:09 +0800 Subject: [PATCH] ddl: redece wait time when handling cancelling job (#16827) --- ddl/rollingback.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ddl/rollingback.go b/ddl/rollingback.go index e63d6fd647..f48449f53c 100644 --- a/ddl/rollingback.go +++ b/ddl/rollingback.go @@ -357,12 +357,6 @@ func convertJob2RollbackJob(w *worker, d *ddlCtx, t *meta.Meta, job *model.Job) } if err != nil { - if job.State != model.JobStateRollingback && job.State != model.JobStateCancelled { - logutil.Logger(w.logCtx).Error("[ddl] run DDL job failed", zap.String("job", job.String()), zap.Error(err)) - } else { - logutil.Logger(w.logCtx).Info("[ddl] the DDL job is cancelled normally", zap.String("job", job.String()), zap.Error(err)) - } - if job.Error == nil { job.Error = toTError(err) } @@ -371,6 +365,15 @@ func convertJob2RollbackJob(w *worker, d *ddlCtx, t *meta.Meta, job *model.Job) fmt.Sprintf("DDL job rollback, error msg: %s", job.Error.ToSQLError().Message)) } job.ErrorCount++ + + if job.State != model.JobStateRollingback && job.State != model.JobStateCancelled { + logutil.Logger(w.logCtx).Error("[ddl] run DDL job failed", zap.String("job", job.String()), zap.Error(err)) + } else { + logutil.Logger(w.logCtx).Info("[ddl] the DDL job is cancelled normally", zap.String("job", job.String()), zap.Error(err)) + // If job is cancelled, we shouldn't return an error. + return ver, nil + } } + return }