Unverified Commit 3ef73aea authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #304 from qiaozhanwei/branch-1.0.2 

only one master restart need failure and tolerant task restart scheduler
parents 0ee5bfc4 0d5b4abc

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

+8 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,14 @@ public class ProcessDao extends AbstractBaseDao { 


    }



    public void selfFaultTolerant(int ... states){

        List<ProcessInstance> processInstanceList = processInstanceMapper.listByStatus(states);

        for (ProcessInstance processInstance:processInstanceList){

            selfFaultTolerant(processInstance);

        }



    }



    @Transactional(value = "TransactionManager",rollbackFor = Exception.class)

    public void selfFaultTolerant(ProcessInstance processInstance){

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

+2 −2
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ public class ZKMasterClient extends AbstractZKClient { 
		// register master

		this.registMaster();



		// check if fault tolerance is required

		// check if fault tolerance is required，failure and tolerance

		if (getActiveMasterNum() == 1) {

			processDao.selfFaultTolerant(ExecutionStatus.RUNNING_EXEUTION.ordinal());

			processDao.selfFaultTolerant(ExecutionStatus.RUNNING_EXEUTION.ordinal(),ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal());

		}

	}