test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-11-29 18:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Improvement-16487][Master] Improve the dependent result for workflow dependency tasks (#16488)

Browse Source
This commit is contained in:
veli.yang 2024-08-22 16:28:36 +08:00 committed by GitHub
parent d7f950ce52
commit 10295d322a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java
View File

@ -284,7 +284,7 @@ public class DependentExecute {
addItemVarPool(taskInstance.getVarPool(), taskInstance.getEndTime().getTime());
return DependResult.SUCCESS;
}
return getDependResultByState(taskInstance.getState());
return getDependResultOfTask(processInstance, taskInstance);
}
}
@ -337,18 +337,27 @@ public class DependentExecute {
}
/**
* get dependent result by task/process instance state
* get dependent result by task/process instance
*
* @param state state
* @param processInstance process instance
* @param taskInstance task instance
* @return DependResult
*/
private DependResult getDependResultByState(TaskExecutionStatus state) {
private DependResult getDependResultOfTask(ProcessInstance processInstance, TaskInstance taskInstance) {
TaskExecutionStatus state = taskInstance.getState();
if (!state.isFinished()) {
return DependResult.WAITING;
} else if (state.isSuccess()) {
return DependResult.SUCCESS;
} else {
if (processInstance.getState().isRunning()
&& taskInstance.getRetryTimes() < taskInstance.getMaxRetryTimes()) {
log.info("taskDefinitionCode: {}, taskDefinitionName: {}, retryTimes: {}, maxRetryTimes: {}",
taskInstance.getTaskCode(), taskInstance.getName(), taskInstance.getRetryTimes(),
taskInstance.getMaxRetryTimes());
return DependResult.WAITING;
}
log.warn(
"The dependent task were not executed successfully, so return depend failed. Task code: {}, task name: {}.",
taskInstance.getTaskCode(), taskInstance.getName());