From d83735ab5191f37bfb90b9cb3d534386f7792fbf Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Sun, 5 Dec 2021 15:03:52 +0800 Subject: [PATCH] [Fix-7037][dolphincheduler-server] process instance can not be killed when complement data (#7140) * fix bug 7037 * update processComplementData Co-authored-by: SbloodyS --- .../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 abc887227f..fa047a082d 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 @@ -584,6 +584,10 @@ public class WorkflowExecuteThread implements Runnable { return false; } + if (processInstance.getState() == ExecutionStatus.READY_STOP) { + return false; + } + Date scheduleDate = processInstance.getScheduleTime(); if (scheduleDate == null) { scheduleDate = complementListDate.get(0);