Revert "[bugfix] issue apache#3324"

This reverts commit fa0bb5e.
legen618 · Aug 4, 2020 · 23277bf · 23277bf
1 parent fa0bb5e
commit 23277bf
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/...rver/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/...rver/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -670,11 +670,6 @@ private DependResult isTaskDepsComplete(String taskName) {
         }
 
         TaskNode taskNode = dag.getNode(taskName);
-        // condition node directly return success
-        if (taskNode.isConditionsTask()) {
-            return DependResult.SUCCESS;
-        }
-
         List<String> depNameList = taskNode.getDepList();
         for(String depsNode : depNameList ){
             if(!dag.containsNode(depsNode)
@@ -687,16 +682,10 @@ private DependResult isTaskDepsComplete(String taskName) {
                 return DependResult.WAITING;
             }
             ExecutionStatus depTaskState = completeTaskList.get(depsNode).getState();
-            // conditions task should be handled separately
-            if (dag.getNode(depsNode).isConditionsTask()) {
-                List<String> tmpTaskList = parseConditionTask(depsNode);
-                if (tmpTaskList.contains(taskName)){
-                    return DependResult.SUCCESS;
-                }
-                return DependResult.FAILED;
-            }
-
-            if(depTaskState.typeIsFailure()){
+            // conditions task would not return failed.
+            if(depTaskState.typeIsFailure()
+                    && !DagHelper.haveConditionsAfterNode(depsNode, dag )
+                    && !dag.getNode(depsNode).isConditionsTask()){
                 return DependResult.FAILED;
             }