ddl: fix panic in pause (#47914) (#47933)

close #47902
pingcap · Oct 23, 2023 · 675f6a9 · 675f6a9
1 parent 639f3f2
commit 675f6a9
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/pkg/ddl/index.go b/pkg/ddl/index.go
@@ -2086,9 +2086,11 @@ func (w *worker) executeDistGlobalTask(reorgInfo *reorgInfo) error {
 				return err
 			}
 			err = handle.WaitGlobalTask(ctx, task)
-			if w.isReorgPaused(reorgInfo.Job.ID) {
-				logutil.BgLogger().Warn("job paused by user", zap.String("category", "ddl"), zap.Error(err))
-				return dbterror.ErrPausedDDLJob.GenWithStackByArgs(reorgInfo.Job.ID)
+			if err := w.isReorgRunnable(reorgInfo.Job.ID, true); err != nil {
+				if dbterror.ErrPausedDDLJob.Equal(err) {
+					logutil.BgLogger().Warn("job paused by user", zap.String("category", "ddl"), zap.Error(err))
+					return dbterror.ErrPausedDDLJob.GenWithStackByArgs(reorgInfo.Job.ID)
+				}
 			}
 			return err
 		})
@@ -2116,9 +2118,12 @@ func (w *worker) executeDistGlobalTask(reorgInfo *reorgInfo) error {
 			failpoint.Inject("pauseAfterDistTaskSuccess", func() {
 				MockDMLExecutionOnTaskFinished()
 			})
-			if w.isReorgPaused(reorgInfo.Job.ID) {
-				logutil.BgLogger().Warn("job paused by user", zap.String("category", "ddl"), zap.Error(err))
-				return dbterror.ErrPausedDDLJob.GenWithStackByArgs(reorgInfo.Job.ID)
+
+			if err := w.isReorgRunnable(reorgInfo.Job.ID, true); err != nil {
+				if dbterror.ErrPausedDDLJob.Equal(err) {
+					logutil.BgLogger().Warn("job paused by user", zap.String("category", "ddl"), zap.Error(err))
+					return dbterror.ErrPausedDDLJob.GenWithStackByArgs(reorgInfo.Job.ID)
+				}
 			}
 			return err
 		})
@@ -2147,7 +2152,7 @@ func (w *worker) executeDistGlobalTask(reorgInfo *reorgInfo) error {
 					}
 					if err = handle.CancelGlobalTask(taskKey); err != nil {
 						logutil.BgLogger().Error("cancel global task error", zap.String("category", "ddl"), zap.String("task_key", taskKey), zap.Error(err))
-						// continue to cancel global task
+						// continue to cancel global task.
 						continue
 					}
 				}