This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.4-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.4-prepare by this push:
new c7cb182 cherry pick #4219 to 1.3.4-pre (#4220)
c7cb182 is described below
commit c7cb18242bfba0f2f45f2742d6dd4a5bacafdb1b
Author: Kirs <[email protected]>
AuthorDate: Mon Dec 14 10:36:15 2020 +0800
cherry pick #4219 to 1.3.4-pre (#4220)
---
.../main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java | 7 +++++--
1 file changed, 5 insertions(+), 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
index 563f64f..aa64e53 100644
---
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 @@ public class DagHelper {
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);
}
}