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

[Bug][Master][Fixes 14216]workflow state keep READY_STOP when sub_process state … (#14221)

Browse Source 
* [Bug] [Master] workflow state keep READY_STOP when sub_process state STOP
Fixes #14216

* [Bug] [Master] workflow state keep READY_STOP when sub_process state STOP
Fixes  mvn spotless:apply#14216

* Update testFile.txt.crc

* Update testFile.txt.crc

* Delete testFile.txt.crc
This commit is contained in:
HQFGit 2023-06-06 11:04:32 +08:00 committed by GitHub
parent fdb8fde776
commit d587b5f03d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
View File

@ -1688,8 +1688,10 @@ public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatus> {
if (state == WorkflowExecutionStatus.READY_STOP) { if (state == WorkflowExecutionStatus.READY_STOP) {
List<TaskInstance> killList = getCompleteTaskByState(TaskExecutionStatus.KILL); List<TaskInstance> killList = getCompleteTaskByState(TaskExecutionStatus.KILL);
List<TaskInstance> failList = getCompleteTaskByState(TaskExecutionStatus.FAILURE); List<TaskInstance> failList = getCompleteTaskByState(TaskExecutionStatus.FAILURE);
List<TaskInstance> stopList = getCompleteTaskByState(TaskExecutionStatus.STOP);
WorkflowExecutionStatus executionStatus; WorkflowExecutionStatus executionStatus;
if (CollectionUtils.isNotEmpty(killList) || CollectionUtils.isNotEmpty(failList) || !isComplementEnd()) { if (CollectionUtils.isNotEmpty(stopList) || CollectionUtils.isNotEmpty(killList)
|| CollectionUtils.isNotEmpty(failList) || !isComplementEnd()) {
executionStatus = WorkflowExecutionStatus.STOP; executionStatus = WorkflowExecutionStatus.STOP;
} else { } else {
executionStatus = WorkflowExecutionStatus.SUCCESS; executionStatus = WorkflowExecutionStatus.SUCCESS;

6
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java
View File

@ -88,8 +88,12 @@ public enum TaskExecutionStatus {
return this == TaskExecutionStatus.PAUSE; return this == TaskExecutionStatus.PAUSE;
} }
public boolean isStop() {
return this == TaskExecutionStatus.STOP;
}
public boolean isFinished() { public boolean isFinished() {
return isSuccess() || isKill() || isFailure() || isPause(); return isSuccess() || isKill() || isFailure() || isPause() || isStop();
} }
public boolean isNeedFaultTolerance() { public boolean isNeedFaultTolerance() {