You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/11/14 17:56:20 UTC
[dolphinscheduler] branch 2.0.0-release-prepare updated: fix complement data retry bug; issues: [Bug] [Master] A bug on task retry mechanism #6613 (#6843) (#6847)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 2.0.0-release-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.0-release-prepare by this push:
new 92347a7 fix complement data retry bug; issues: [Bug] [Master] A bug on task retry mechanism #6613 (#6843) (#6847)
92347a7 is described below
commit 92347a73e04240035bf63f4d63e657fe9e948e3e
Author: JinYong Li <42...@users.noreply.github.com>
AuthorDate: Mon Nov 15 01:56:14 2021 +0800
fix complement data retry bug; issues: [Bug] [Master] A bug on task retry mechanism #6613 (#6843) (#6847)
Co-authored-by: yangqiyu <ya...@deepexi.com>
Co-authored-by: KyoYang <39...@users.noreply.github.com>
Co-authored-by: yangqiyu <ya...@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 d6b266f..f0a9562 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;