[incubator-dolphinscheduler] branch dev updated: remove the duplicate function in MasterExecThread (#3329)

[journey]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 78856fb  remove the duplicate function in MasterExecThread (#3329)
78856fb is described below

commit 78856fb08e512b62ab7b24c809407616b2b4bbc5
Author: zixi0825 <649790...@qq.com>
AuthorDate: Wed Jul 29 19:15:03 2020 +0800

    remove the duplicate function in MasterExecThread (#3329)
    
    Co-authored-by: sunchaohe <sunzha...@linklogis.com>
---
 .../server/master/runner/MasterExecThread.java       | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

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 b73e5df..031533f 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
@@ -802,7 +802,7 @@ public class MasterExecThread implements Runnable {
         ProcessInstance instance = 
processService.findProcessInstanceById(processInstance.getId());
         ExecutionStatus state = instance.getState();
 
-        if(activeTaskNode.size() > 0 || retryTaskExists()){
+        if(activeTaskNode.size() > 0 || hasRetryTaskInStandBy()){
             // active task and retry task exists
             return runningState(state);
         }
@@ -853,24 +853,6 @@ public class MasterExecThread implements Runnable {
     }
 
     /**
-     * whether standby task list have retry tasks
-     * @return
-     */
-    private boolean retryTaskExists() {
-
-        boolean result = false;
-
-        for(String taskName : readyToSubmitTaskList.keySet()){
-            TaskInstance task = readyToSubmitTaskList.get(taskName);
-            if(task.getState().typeIsFailure()){
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /**
      * whether complement end
      * @return Boolean whether is complement end
      */