Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
4748df99
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4748df99
编写于
1月 20, 2022
作者:
W
wind
提交者:
GitHub
1月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add delete workflow instance when delete process definition (#8131)
Co-authored-by:
N
caishunfeng
<
534328519@qq.com
>
上级
05545e10
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
1 deletion
+35
-1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
...eduler/api/service/impl/ProcessDefinitionServiceImpl.java
+33
-0
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
...ache/dolphinscheduler/service/process/ProcessService.java
+2
-1
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
浏览文件 @
4748df99
...
...
@@ -709,10 +709,43 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
if
(
deleteRelation
==
0
)
{
logger
.
warn
(
"The process definition has not relation, it will be delete successfully"
);
}
try
{
syncDeleteWorkflowInstanceByCode
(
processDefinition
.
getCode
());
}
catch
(
Exception
e
)
{
logger
.
error
(
"delete workflow instance error"
,
e
);
}
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
}
/**
* delete workflow instance by processDefinitionCode
* 1.delete processInstances
* 2.delete subWorkProcesses
* 3.delete processMap
* 4.delete taskInstances
*
* todo delete syncly may take a long time when many processInstance
* @param processDefinitionCode
*/
private
void
syncDeleteWorkflowInstanceByCode
(
long
processDefinitionCode
)
{
int
pageSize
=
100
;
while
(
true
)
{
List
<
ProcessInstance
>
deleteProcessInstances
=
processInstanceService
.
queryByProcessDefineCode
(
processDefinitionCode
,
pageSize
);
if
(
CollectionUtils
.
isEmpty
(
deleteProcessInstances
))
{
break
;
}
for
(
ProcessInstance
deleteProcessInstance
:
deleteProcessInstances
)
{
processService
.
deleteWorkProcessInstanceById
(
deleteProcessInstance
.
getId
());
processService
.
deleteAllSubWorkProcessByParentId
(
deleteProcessInstance
.
getId
());
processService
.
deleteWorkProcessMapByParentId
(
deleteProcessInstance
.
getId
());
processService
.
deleteWorkTaskInstanceByProcessInstanceId
(
deleteProcessInstance
.
getId
());
}
}
}
/**
* release process definition: online / offline
*
...
...
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
浏览文件 @
4748df99
...
...
@@ -17,7 +17,6 @@
package
org.apache.dolphinscheduler.service.process
;
import
static
java
.
util
.
stream
.
Collectors
.
toSet
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMDPARAM_COMPLEMENT_DATA_END_DATE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMDPARAM_COMPLEMENT_DATA_START_DATE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMD_PARAM_EMPTY_SUB_PROCESS
;
...
...
@@ -28,6 +27,8 @@ import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
LOCAL_PARAMS
;
import
static
java
.
util
.
stream
.
Collectors
.
toSet
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.AuthorizationType
;
import
org.apache.dolphinscheduler.common.enums.CommandType
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录