natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix find last process instance in dependent task is not correct (#11424) (#12009) 

(cherry picked from commit a2b5219315)
This commit is contained in:
Wenjun Ruan 2022-09-17 17:50:56 +08:00 committed by GitHub
parent a615e6ee3d
commit 0237654e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,23 +185,45 @@ public class DependentExecute {
*/
private ProcessInstance findLastProcessInterval(Long definitionCode, DateInterval dateInterval) {
ProcessInstance runningProcess = processService.findLastRunningProcess(definitionCode, dateInterval.getStartTime(), dateInterval.getEndTime());
if (runningProcess != null) {
return runningProcess;
}
ProcessInstance lastSchedulerProcess = processService.findLastSchedulerProcessInterval(definitionCode, dateInterval);
/**
* Find the last manual/schedule processInstance.
* Return the nonnull one first.
* Return the finished one first.
* Return the start later one first.
* Return the manual one first.
*/
ProcessInstance lastSchedulerProcess =
processService.findLastSchedulerProcessInterval(definitionCode, dateInterval);
ProcessInstance lastManualProcess = processService.findLastManualProcessInterval(definitionCode, dateInterval);
if (lastManualProcess == null && lastSchedulerProcess == null) {
return null;
}
if (lastManualProcess == null) {
return lastSchedulerProcess;
}
if (lastSchedulerProcess == null) {
return lastManualProcess;
}
return (lastManualProcess.getEndTime().after(lastSchedulerProcess.getEndTime())) ? lastManualProcess : lastSchedulerProcess;
if (lastManualProcess.getEndTime() == null && lastSchedulerProcess.getEndTime() == null) {
return lastManualProcess.getStartTime().after(lastSchedulerProcess.getStartTime()) ? lastManualProcess
: lastSchedulerProcess;
}
if (lastSchedulerProcess.getEndTime() == null) {
return lastManualProcess;
}
if (lastManualProcess.getEndTime() == null) {
return lastSchedulerProcess;
}
return (lastManualProcess.getEndTime().after(lastSchedulerProcess.getEndTime())) ? lastManualProcess
: lastSchedulerProcess;
}
/**