[Bug] [Fix-10673] Workflow recovery bug with failed tasks (#10722)

* fix 10517 * fix dep warn bug * fix recover bug Co-authored-by: JinyLeeChina <jiny.li@foxmail.com>
apache · Jul 1, 2022 · ab046da · ab046da
1 parent 2d5b9dc
commit ab046da
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -1125,6 +1125,22 @@ private boolean hasFailedTask() {
             if (errorTaskList.size() > 0) {
                 return true;
             }
+        } else {
+            if (processInstance.getCommandType() == CommandType.RECOVER_TOLERANCE_FAULT_PROCESS
+                || processInstance.getCommandType() == CommandType.RECOVER_SUSPENDED_PROCESS) {
+                List<Integer> failedList = processService.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE);
+                if (!failedList.isEmpty()) {
+                    return true;
+                }
+                List<Integer> toleranceList = processService.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE);
+                if (!toleranceList.isEmpty()) {
+                    return true;
+                }
+                List<Integer> killedList = processService.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL);
+                if (!killedList.isEmpty()) {
+                    return true;
+                }
+            }
         }
         return dependFailedTask.size() > 0;
     }