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

[leonbao]

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

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


The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
     new 2cfa0a2  [1.3.6-prepare]modify process contain depend task is always 
running #5344 (#5345)
2cfa0a2 is described below

commit 2cfa0a2799afe5c9a69a5b2f492c7bfa04bcb0c1
Author: Kirs <acm_mas...@163.com>
AuthorDate: Wed Apr 21 22:41:31 2021 +0800

    [1.3.6-prepare]modify process contain depend task is always running #5344 
(#5345)
    
    pr #5344
    issue #5328
---
 .../org/apache/dolphinscheduler/service/process/ProcessService.java     | 2 +-
 1 file changed, 1 insertion(+), 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 2aa0434..5cc5aa9 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
@@ -1163,7 +1163,7 @@ 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;
             }
         }