cherry pick #4219 to 1.3.4-pre (#4220)

apache · Dec 14, 2020 · c7cb182 · c7cb182
1 parent 933eac7
commit c7cb182
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
@@ -374,11 +374,14 @@ private static void setTaskNodeSkip(String skipNodeName,
  DAG<String, TaskNode, TaskNodeRelation> dag,
  Map<String, TaskInstance> completeTaskList,
  Map<String, TaskNode> skipTaskNodeList){
+ if (!dag.containsNode(skipNodeName)) {
+ return;
+ }
  skipTaskNodeList.putIfAbsent(skipNodeName, dag.getNode(skipNodeName));
  Collection<String> postNodeList = dag.getSubsequentNodes(skipNodeName);
- for(String post : postNodeList){
+ for (String post : postNodeList) {
  TaskNode postNode = dag.getNode(post);
- if(isTaskNodeNeedSkip(postNode, skipTaskNodeList)){
+ if (isTaskNodeNeedSkip(postNode, skipTaskNodeList)) {
  setTaskNodeSkip(post, dag, completeTaskList, skipTaskNodeList);
  }
  }