Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
d09d68e1
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
706
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
d09d68e1
编写于
12月 03, 2021
作者:
Z
zwZjut
提交者:
GitHub
12月 03, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
to #7065: fix ExecutorService and schedulerService (#7072)
Co-authored-by:
N
honghuo.zw
<
honghuo.zw@alibaba-inc.com
>
上级
99f6ab38
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
10 deletion
+12
-10
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
.../apache/dolphinscheduler/api/service/ExecutorService.java
+2
-1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
...olphinscheduler/api/service/impl/ExecutorServiceImpl.java
+5
-4
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
...lphinscheduler/api/service/impl/SchedulerServiceImpl.java
+5
-5
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
浏览文件 @
d09d68e1
...
...
@@ -68,11 +68,12 @@ public interface ExecutorService {
/**
* check whether the process definition can be executed
*
* @param projectCode project code
* @param processDefinition process definition
* @param processDefineCode process definition code
* @return check result code
*/
Map
<
String
,
Object
>
checkProcessDefinitionValid
(
ProcessDefinition
processDefinition
,
long
processDefineCode
);
Map
<
String
,
Object
>
checkProcessDefinitionValid
(
long
projectCode
,
ProcessDefinition
processDefinition
,
long
processDefineCode
);
/**
* do action to process instance:pause, stop, repeat, recover from pause, recover from stop
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
浏览文件 @
d09d68e1
...
...
@@ -153,7 +153,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
// check process define release state
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryByCode
(
processDefinitionCode
);
result
=
checkProcessDefinitionValid
(
processDefinition
,
processDefinitionCode
);
result
=
checkProcessDefinitionValid
(
pro
jectCode
,
pro
cessDefinition
,
processDefinitionCode
);
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
return
result
;
}
...
...
@@ -208,14 +208,15 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
/**
* check whether the process definition can be executed
*
* @param projectCode project code
* @param processDefinition process definition
* @param processDefineCode process definition code
* @return check result code
*/
@Override
public
Map
<
String
,
Object
>
checkProcessDefinitionValid
(
ProcessDefinition
processDefinition
,
long
processDefineCode
)
{
public
Map
<
String
,
Object
>
checkProcessDefinitionValid
(
long
projectCode
,
ProcessDefinition
processDefinition
,
long
processDefineCode
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
if
(
processDefinition
==
null
)
{
if
(
processDefinition
==
null
||
projectCode
!=
processDefinition
.
getProjectCode
()
)
{
// check process definition exists
putMsg
(
result
,
Status
.
PROCESS_DEFINE_NOT_EXIST
,
processDefineCode
);
}
else
if
(
processDefinition
.
getReleaseState
()
!=
ReleaseState
.
ONLINE
)
{
...
...
@@ -259,7 +260,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
ProcessDefinition
processDefinition
=
processService
.
findProcessDefinition
(
processInstance
.
getProcessDefinitionCode
(),
processInstance
.
getProcessDefinitionVersion
());
if
(
executeType
!=
ExecuteType
.
STOP
&&
executeType
!=
ExecuteType
.
PAUSE
)
{
result
=
checkProcessDefinitionValid
(
processDefinition
,
processInstance
.
getProcessDefinitionCode
());
result
=
checkProcessDefinitionValid
(
pro
jectCode
,
pro
cessDefinition
,
processInstance
.
getProcessDefinitionCode
());
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
return
result
;
}
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
浏览文件 @
d09d68e1
...
...
@@ -146,7 +146,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl implements SchedulerSe
// check work flow define release state
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryByCode
(
processDefineCode
);
result
=
executorService
.
checkProcessDefinitionValid
(
processDefinition
,
processDefineCode
);
result
=
executorService
.
checkProcessDefinitionValid
(
pro
jectCode
,
pro
cessDefinition
,
processDefineCode
);
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
return
result
;
}
...
...
@@ -247,7 +247,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl implements SchedulerSe
}
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryByCode
(
schedule
.
getProcessDefinitionCode
());
if
(
processDefinition
==
null
)
{
if
(
processDefinition
==
null
||
projectCode
!=
processDefinition
.
getProjectCode
()
)
{
putMsg
(
result
,
Status
.
PROCESS_DEFINE_NOT_EXIST
,
schedule
.
getProcessDefinitionCode
());
return
result
;
}
...
...
@@ -296,7 +296,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl implements SchedulerSe
return
result
;
}
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryByCode
(
scheduleObj
.
getProcessDefinitionCode
());
if
(
processDefinition
==
null
)
{
if
(
processDefinition
==
null
||
projectCode
!=
processDefinition
.
getProjectCode
()
)
{
putMsg
(
result
,
Status
.
PROCESS_DEFINE_NOT_EXIST
,
scheduleObj
.
getProcessDefinitionCode
());
return
result
;
}
...
...
@@ -396,7 +396,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl implements SchedulerSe
}
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryByCode
(
processDefineCode
);
if
(
processDefinition
==
null
)
{
if
(
processDefinition
==
null
||
projectCode
!=
processDefinition
.
getProjectCode
()
)
{
putMsg
(
result
,
Status
.
PROCESS_DEFINE_NOT_EXIST
,
processDefineCode
);
return
result
;
}
...
...
@@ -606,7 +606,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl implements SchedulerSe
}
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryByCode
(
processDefinitionCode
);
if
(
processDefinition
==
null
)
{
if
(
processDefinition
==
null
||
projectCode
!=
processDefinition
.
getProjectCode
()
)
{
putMsg
(
result
,
Status
.
PROCESS_DEFINE_NOT_EXIST
,
processDefinitionCode
);
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录