From 92347a73e04240035bf63f4d63e657fe9e948e3e Mon Sep 17 00:00:00 2001
From: JinYong Li <42576980+JinyLeeChina@users.noreply.github.com>
Date: Mon, 15 Nov 2021 01:56:14 +0800
Subject: [PATCH] fix complement data retry bug; issues: [Bug] [Master] A bug
 on task retry mechanism #6613 (#6843) (#6847)

Co-authored-by: yangqiyu <yangqiyu@deepexi.com>

Co-authored-by: KyoYang <39785282+yangqiyu0306@users.noreply.github.com>
Co-authored-by: yangqiyu <yangqiyu@deepexi.com>
---
 .../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 d6b266f926..f0a9562528 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
@@ -979,7 +979,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;