test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-01 19:58:29 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

[Improvement]Add a stop function when you are ready to do pause operation (#11543)

Browse Source 
* add can stop for execute state machine

* add execute type check for pause operation
This commit is contained in:
juzimao 2022-08-18 21:32:53 +08:00 committed by GitHub
parent 277c78010f
commit 3b72c6efe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
View File

@ -478,11 +478,15 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
boolean checkResult = false;
switch (executeType) {
case PAUSE:
case STOP:
if (executionStatus.isRunning()) {
checkResult = true;
}
break;
case STOP:
if (executionStatus.canStop()) {
checkResult = true;
}
break;
case REPEAT_RUNNING:
if (executionStatus.isFinished()) {
checkResult = true;

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java
View File

@ -71,6 +71,10 @@ public enum WorkflowExecutionStatus {
return this == RUNNING_EXECUTION;
}
public boolean canStop() {
return this == RUNNING_EXECUTION || this == READY_PAUSE;
}
public boolean isFinished() {
// todo: do we need to remove pause/block in finished judge?
return isSuccess() || isFailure() || isStop() || isPause() || isBlock();