未验证 提交 59685d88 编写于 作者: K Kirs 提交者: GitHub

[1.3.6-prepare]work flow would running if task is killed by manual. (#5363)

pr #5362
issue #5349
上级 709dfe27
......@@ -26,6 +26,7 @@ public enum DependResult {
* 0 success
* 1 waiting
* 2 failed
* 3 non execution
*/
SUCCESS, WAITING, FAILED
SUCCESS, WAITING, FAILED, NON_EXEC
}
......@@ -527,7 +527,7 @@ public class MasterExecThread implements Runnable {
}
ExecutionStatus depTaskState = completeTaskList.get(depsNode).getState();
if(depTaskState.typeIsPause() || depTaskState.typeIsCancel()){
return DependResult.WAITING;
return DependResult.NON_EXEC;
}
// ignore task state if current task is condition
if(taskNode.isConditionsTask()){
......@@ -1017,7 +1017,11 @@ public class MasterExecThread implements Runnable {
dependFailedTask.put(task.getName(), task);
removeTaskFromStandbyList(task);
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) {
logger.error("submit standby task error",e);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册