From cca1c4a17292e2a71d39be4ce4d828eed75d4a5c Mon Sep 17 00:00:00 2001
From: Dyqer <Dyqer@hotmail.com>
Date: Mon, 20 Nov 2023 21:02:44 +0800
Subject: [PATCH] fix can't stop bug (#15191)

Co-authored-by: Leoric Yue <leoric.yue@zoom.us>
---
 .../server/master/event/WorkflowStateEventHandler.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java
index 6db84dadc1..018cff565a 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java
@@ -63,10 +63,13 @@ public class WorkflowStateEventHandler implements StateEventHandler {
             }
             workflowExecuteRunnable.endProcess();
         }
-        if (processInstance.getState().isReadyStop()) {
-            workflowExecuteRunnable.killAllTasks();
-        }
 
+        if (workflowStateEvent.getStatus().isReadyStop()) {
+            workflowExecuteRunnable.refreshProcessInstance(processInstance.getId());
+            if (processInstance.getState().isReadyStop()) {
+                workflowExecuteRunnable.killAllTasks();
+            }
+        }
         return true;
     }