cherry pick pingcap#24146 to release-5.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Apr 25, 2021 · ce32aec · ce32aec
1 parent 1145e34
commit ce32aec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ddl/ddl.go b/ddl/ddl.go
@@ -592,6 +592,7 @@ func (d *ddl) doDDLJob(ctx sessionctx.Context, job *model.Job) error {
 		}
 
 		if historyJob.Error != nil {
+			logutil.BgLogger().Info("[ddl] DDL job is failed", zap.Int64("jobID", jobID))
 			return errors.Trace(historyJob.Error)
 		}
 		// Only for JobStateCancelled job which is adding columns or drop columns.

diff --git a/ddl/ddl_worker.go b/ddl/ddl_worker.go
@@ -563,7 +563,7 @@ func (w *worker) handleDDLJobQueue(d *ddlCtx) error {
 		d.mu.hook.OnJobUpdated(job)
 		d.mu.RUnlock()
 
-		if job.IsSynced() || job.IsCancelled() {
+		if job.IsSynced() || job.IsCancelled() || job.IsRollbackDone() {
 			asyncNotify(d.ddlJobDoneCh)
 		}
 	}