This is an automated email from the ASF dual-hosted git repository. zhongjiajie pushed a commit to branch 3.0.0-beta-prepare in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 7b0e6fe5ecb56c5231bf0fe60d5253593df69b9d Author: WangJPLeo <[email protected]> AuthorDate: Thu May 12 16:31:53 2022 +0800 [Fix-9975] The selected task instance was recreated when the Master service fail… (#9976) * The selected task instance was recreated when the Master service failed over. * Returns the expression result directly. * Use Recovery to determine whether to use the old task instance. (cherry picked from commit dbdbfeaeee4b6aaaa738ef642a908f700f0cb9bc) --- .../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java index 98556dc0f0..3b7b5511ae 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java @@ -1960,6 +1960,9 @@ public class WorkflowExecuteThread { private boolean isNewProcessInstance() { if (ExecutionStatus.RUNNING_EXECUTION == processInstance.getState() && processInstance.getRunTimes() == 1) { return true; + } else if (processInstance.getRecovery().equals(Flag.YES)) { + // host is empty use old task instance + return false; } else { return false; }
