Commit 7e22b6a5 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

master startup fault tolerance update

parent 8d731974

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

+10 −4
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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){