You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ji...@apache.org on 2022/12/19 07:52:55 UTC
[dolphinscheduler] branch 2.0.8-prepare updated: [Fix-12586] [Master] Repeat running the complement process instance will generate redundant complement instances (#12606)
This is an automated email from the ASF dual-hosted git repository.
jinyleechina pushed a commit to branch 2.0.8-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.8-prepare by this push:
new c204b39dfd [Fix-12586] [Master] Repeat running the complement process instance will generate redundant complement instances (#12606)
c204b39dfd is described below
commit c204b39dfd745a20d5c9838305a757cc220e6832
Author: Molin Wang <wc...@gmail.com>
AuthorDate: Mon Dec 19 15:52:48 2022 +0800
[Fix-12586] [Master] Repeat running the complement process instance will generate redundant complement instances (#12606)
---
.../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 4 ++++
1 file changed, 4 insertions(+)
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 89090cb639..8a0f5f2986 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
@@ -534,6 +534,10 @@ public class WorkflowExecuteThread implements Runnable {
scheduleDate = complementListDate.get(0);
} else if (processInstance.getState().typeIsFinished()) {
endProcess();
+ // rerun process instance of complement didn't need create the next process complement
+ if (processInstance.getCommandType() == CommandType.REPEAT_RUNNING) {
+ return true;
+ }
if (complementListDate.size() <= 0) {
logger.info("process complement end. process id:{}", processInstance.getId());
return true;