[1.3.6-prepare]modify process contain depend task is always running #5344 (#5345)

CalvinKirs · web-flow · commit 2cfa0a2799af · 2021-04-21T22:41:31.000+08:00
pr #5344 issue #5328
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -1163,7 +1163,7 @@ private boolean checkProcessStrategy(TaskInstance taskInstance){
         List<TaskInstance> taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId());
 
         for(TaskInstance task : taskInstances){
-            if(task.getState() == ExecutionStatus.FAILURE){
+            if (task.getState() == ExecutionStatus.FAILURE && task.getRetryTimes() >= task.getMaxRetryTimes()) {
                 return false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1163,7 +1163,7 @@ private boolean checkProcessStrategy(TaskInstance taskInstance){`
`1163`	`1163`	`List<TaskInstance> taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId());`
`1164`	`1164`
`1165`	`1165`	`for(TaskInstance task : taskInstances){`
`1166`		`- if(task.getState() == ExecutionStatus.FAILURE){`
	`1166`	`+ if (task.getState() == ExecutionStatus.FAILURE && task.getRetryTimes() >= task.getMaxRetryTimes()) {`
`1167`	`1167`	`return false;`
`1168`	`1168`	`}`
`1169`	`1169`	`}`