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

[2.0.3][Bug-7986] Disable deletion of running workflow (#8064) 

Co-authored-by: caishunfeng <534328519@qq.com>
This commit is contained in:
wind 2022-01-16 18:51:38 +08:00 committed by GitHub
parent 49ce61e496
commit 0ba4263d90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
View File

@ -623,6 +623,12 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, String.valueOf(processInstanceId));
return result;
}
//check process instance status
if (!processInstance.getState().typeIsFinished()) {
putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR,
processInstance.getName(), processInstance.getState().toString(), "delete");
return result;
}
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
@ -632,7 +638,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
try {
processService.removeTaskLogFile(processInstanceId);
} catch (Exception e) {
} catch (Exception ignore) {
// ignore
}
// delete database cascade