Commit 0bf8e270 authored by baoliang's avatar baoliang
Browse files

fix bug: tolerance task need not to check retry times

parent a40fcc0e

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

+5 −1
Original line number Diff line number Diff line
@@ -923,7 +923,11 @@ public class ProcessDao extends AbstractBaseDao { 
                    taskInstance.setFlag(Flag.NO);

                    updateTaskInstance(taskInstance);

                    // crate new task instance

                    if(taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE){

                        taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1 );

                    }

                    taskInstance.setEndTime(null);

                    taskInstance.setStartTime(new Date());

                    taskInstance.setFlag(Flag.YES);

                    taskInstance.setHost(null);

                    taskInstance.setId(0);

escheduler-dao/src/main/java/cn/escheduler/dao/model/TaskInstance.java

+5 −1
Original line number Diff line number Diff line
@@ -422,9 +422,13 @@ public class TaskInstance { 
        if(this.isSubProcess()){

            return false;

        }

        if(this.getState() == ExecutionStatus.NEED_FAULT_TOLERANCE){

            return true;

        }else {

            return (this.getState().typeIsFailure()

                && this.getRetryTimes() < this.getMaxRetryTimes());

        }

    }



    public void setDependency(String dependency) {

        this.dependency = dependency;