[dolphinscheduler] branch dev updated: fix complement data retry bug; issues: [Bug] [Master] A bug on task retry mechanism #6613 (#6843)

[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 94f6c5c  fix complement data retry bug; issues: [Bug] [Master] A bug 
on task retry mechanism #6613 (#6843)
94f6c5c is described below

commit 94f6c5c27ee88d5ec6f7f3856b2bc2aebab738e8
Author: KyoYang <39785282+yangqiyu0...@users.noreply.github.com>
AuthorDate: Mon Nov 15 01:05:13 2021 +0800

    fix complement data retry bug; issues: [Bug] [Master] A bug on task retry 
mechanism #6613 (#6843)
    
    Co-authored-by: yangqiyu <yangq...@deepexi.com>
---
 .../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
index 54792ca..ad12abe 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -1007,7 +1007,7 @@ public class WorkflowExecuteThread implements Runnable {
                 return true;
             }
             if (processInstance.getFailureStrategy() == 
FailureStrategy.CONTINUE) {
-                return readyToSubmitTaskQueue.size() == 0 || 
activeTaskProcessorMaps.size() == 0;
+                return readyToSubmitTaskQueue.size() == 0 && 
activeTaskProcessorMaps.size() == 0;
             }
         }
         return false;