[dolphinscheduler] branch dev updated: [Fix-7037][dolphincheduler-server] process instance can not be killed when complement data (#7140)

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new d83735a  [Fix-7037][dolphincheduler-server] process instance can not be killed when complement data (#7140)
d83735a is described below

commit d83735ab5191f37bfb90b9cb3d534386f7792fbf
Author: SbloodyS <46...@qq.com>
AuthorDate: Sun Dec 5 15:03:52 2021 +0800

    [Fix-7037][dolphincheduler-server] process instance can not be killed when complement data (#7140)
    
    * fix bug 7037
    
    * update processComplementData
    
    Co-authored-by: SbloodyS <sb...@qq.com>
---
 .../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 abc8872..fa047a0 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);