Merge pull request #365 from qiaozhanwei/branch-1.0.2

master startup fault tolerance update

escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java

@@ -1377,7 +1377,7 @@ public class ProcessDao extends AbstractBaseDao {
      * @return
      */
     public List<TaskInstance> queryNeedFailoverTaskInstances(String host){
-        return taskInstanceMapper.queryByHostAndStatus(host,stateArray);
+        return taskInstanceMapper.queryByHostAndStatus(host, stateArray);
     }
 
     /**
@@ -1555,10 +1555,16 @@ public class ProcessDao extends AbstractBaseDao {
 
     }
 
-    public void selfFaultTolerant(int ... states){
-        List<ProcessInstance> processInstanceList = processInstanceMapper.listByStatus(states);
+    /**
+     * master starup fault tolerant
+     */
+    public void masterStartupFaultTolerant(){
+
+        int[] readyStopAndKill=new int[]{ExecutionStatus.READY_PAUSE.ordinal(),ExecutionStatus.READY_STOP.ordinal(),
+                ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(),ExecutionStatus.RUNNING_EXEUTION.ordinal()};
+        List<ProcessInstance> processInstanceList = processInstanceMapper.listByStatus(readyStopAndKill);
         for (ProcessInstance processInstance:processInstanceList){
-            selfFaultTolerant(processInstance);
+            processNeedFailoverProcessInstances(processInstance);
         }
 
     }

escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java

@@ -134,7 +134,7 @@ public class ZKMasterClient extends AbstractZKClient {
 
 			// check if fault tolerance is required，failure and tolerance
 			if (getActiveMasterNum() == 1) {
-				processDao.selfFaultTolerant(ExecutionStatus.RUNNING_EXEUTION.ordinal(),ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal());
+				processDao.masterStartupFaultTolerant();
 			}
 
 		}catch (Exception e){