address coment

pingcap · Apr 19, 2023 · f434742 · f434742
1 parent 96732b0
commit f434742
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/disttask/framework/scheduler/scheduler.go b/disttask/framework/scheduler/scheduler.go
@@ -154,16 +154,12 @@ func (s *InternalSchedulerImpl) Run(ctx context.Context, task *proto.Task) error
 			}
 		}
 		minimalTaskWg.Wait()
-		if err := s.getError(); err != nil {
-			if errors.Cause(err) == context.Canceled {
-				s.updateSubtaskState(subtask.ID, proto.TaskStateCanceled)
-			} else {
-				s.updateSubtaskState(subtask.ID, proto.TaskStateFailed)
+		if err := s.getError(); err == nil {
+			if err := scheduler.OnSubtaskFinished(runCtx, subtask.Meta); err != nil {
+				s.onError(err)
 			}
-			break
 		}
-		if err := scheduler.OnSubtaskFinished(runCtx, subtask.Meta); err != nil {
-			s.onError(err)
+		if err := s.getError(); err != nil {
 			if errors.Cause(err) == context.Canceled {
 				s.updateSubtaskState(subtask.ID, proto.TaskStateCanceled)
 			} else {