[dolphinscheduler] branch dev updated: 【BUG-5328】 modify process contain depend task is always running (#5344)

[leonbao]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new e12a262  【BUG-5328】 modify process contain depend task is always 
running (#5344)
e12a262 is described below

commit e12a26289bce0b38bd65ac74a3349ecadd8a9141
Author: wanghong1314 <498213...@qq.com>
AuthorDate: Wed Apr 21 22:29:53 2021 +0800

    【BUG-5328】 modify process contain depend task is always running (#5344)
    
    Co-authored-by: wanghong1314 <wangho...@onething.net>
---
 .../org/apache/dolphinscheduler/service/process/ProcessService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 1f48821..49c64be 100644
--- 
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
@@ -1264,7 +1264,8 @@ public class ProcessService {
         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;
             }
         }