|
|
@ -617,7 +617,7 @@ public class MasterExecThread implements Runnable { |
|
|
|
} |
|
|
|
} |
|
|
|
ExecutionStatus depTaskState = completeTaskList.get(depsNode).getState(); |
|
|
|
ExecutionStatus depTaskState = completeTaskList.get(depsNode).getState(); |
|
|
|
if (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) { |
|
|
|
if (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) { |
|
|
|
return DependResult.WAITING; |
|
|
|
return DependResult.NON_EXEC; |
|
|
|
} |
|
|
|
} |
|
|
|
// ignore task state if current task is condition
|
|
|
|
// ignore task state if current task is condition
|
|
|
|
if (taskNode.isConditionsTask()) { |
|
|
|
if (taskNode.isConditionsTask()) { |
|
|
@ -1148,6 +1148,10 @@ public class MasterExecThread implements Runnable { |
|
|
|
dependFailedTask.put(task.getName(), task); |
|
|
|
dependFailedTask.put(task.getName(), task); |
|
|
|
removeTaskFromStandbyList(task); |
|
|
|
removeTaskFromStandbyList(task); |
|
|
|
logger.info("task {},id:{} depend result : {}", task.getName(), task.getId(), dependResult); |
|
|
|
logger.info("task {},id:{} depend result : {}", task.getName(), task.getId(), dependResult); |
|
|
|
|
|
|
|
} else if (DependResult.NON_EXEC == dependResult) { |
|
|
|
|
|
|
|
// for some reasons(depend task pause/stop) this task would not be submit
|
|
|
|
|
|
|
|
removeTaskFromStandbyList(task); |
|
|
|
|
|
|
|
logger.info("remove task {},id:{} , because depend result : {}", task.getName(), task.getId(), dependResult); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|