[incubator-dolphinscheduler] branch 1.3.3-release updated: fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master

[ki...@apache.org]

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

kirs pushed a commit to branch 1.3.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.3-release by this push:
     new ba97191  fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
     new 4f94943  Merge pull request #3947 from lenboo/133-fault
ba97191 is described below

commit ba971912bf45a11a5d58518d35aa52725ac8699e
Author: baoliang <ba...@analysys.com.cn>
AuthorDate: Mon Oct 19 15:47:18 2020 +0800

    fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
---
 .../apache/dolphinscheduler/server/master/runner/MasterExecThread.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 15cc814..df7273e 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -973,7 +973,7 @@ public class MasterExecThread implements Runnable {
         // submit start node
         submitPostNode(null);
         boolean sendTimeWarning = false;
-        while(!processInstance.isProcessInstanceStop()){
+        while(!processInstance.isProcessInstanceStop() && Stopper.isRunning()){
 
             // send warning email if process time out.
             if(!sendTimeWarning && checkProcessTimeOut(processInstance) ){