Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
79454e46
DolphinScheduler
项目概览
淡淡忧伤的程序员
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
48
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
79454e46
编写于
4月 22, 2019
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update worker group
上级
eeceb7ce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
5 deletion
+6
-5
escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java
...java/cn/escheduler/api/controller/ExecutorController.java
+2
-2
escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java
.../main/java/cn/escheduler/api/service/ExecutorService.java
+4
-3
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java
浏览文件 @
79454e46
...
...
@@ -66,7 +66,7 @@ public class ExecutorController extends BaseController {
@RequestParam
(
value
=
"receiversCc"
,
required
=
false
)
String
receiversCc
,
@RequestParam
(
value
=
"runMode"
,
required
=
false
)
RunMode
runMode
,
@RequestParam
(
value
=
"processInstancePriority"
,
required
=
false
)
Priority
processInstancePriority
,
@RequestParam
(
value
=
"workerGroupId"
,
required
=
false
)
int
workerGroupId
,
@RequestParam
(
value
=
"workerGroupId"
,
required
=
false
,
defaultValue
=
"0"
)
int
workerGroupId
,
@RequestParam
(
value
=
"timeout"
,
required
=
false
)
Integer
timeout
)
{
try
{
logger
.
info
(
"login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
...
...
@@ -82,7 +82,7 @@ public class ExecutorController extends BaseController {
Map
<
String
,
Object
>
result
=
execService
.
execProcessInstance
(
loginUser
,
projectName
,
processDefinitionId
,
scheduleTime
,
execType
,
failureStrategy
,
startNodeList
,
taskDependType
,
warningType
,
warningGroupId
,
receivers
,
receiversCc
,
runMode
,
processInstancePriority
,
timeout
);
warningGroupId
,
receivers
,
receiversCc
,
runMode
,
processInstancePriority
,
workerGroupId
,
timeout
);
return
returnDataList
(
result
);
}
catch
(
Exception
e
)
{
logger
.
error
(
START_PROCESS_INSTANCE_ERROR
.
getMsg
(),
e
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java
浏览文件 @
79454e46
...
...
@@ -90,7 +90,7 @@ public class ExecutorService extends BaseService{
FailureStrategy
failureStrategy
,
String
startNodeList
,
TaskDependType
taskDependType
,
WarningType
warningType
,
int
warningGroupId
,
String
receivers
,
String
receiversCc
,
RunMode
runMode
,
Priority
processInstancePriority
,
Integer
timeout
)
throws
ParseException
{
Priority
processInstancePriority
,
int
workerGroupId
,
Integer
timeout
)
throws
ParseException
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
// timeout is valid
if
(
timeout
<=
0
||
timeout
>
MAX_TASK_TIMEOUT
)
{
...
...
@@ -115,7 +115,7 @@ public class ExecutorService extends BaseService{
*/
int
create
=
this
.
createCommand
(
commandType
,
processDefinitionId
,
taskDependType
,
failureStrategy
,
startNodeList
,
cronTime
,
warningType
,
loginUser
.
getId
(),
warningGroupId
,
runMode
,
processInstancePriority
);
warningGroupId
,
runMode
,
processInstancePriority
,
workerGroupId
);
if
(
create
>
0
){
/**
* according to the process definition ID updateProcessInstance and CC recipient
...
...
@@ -405,7 +405,7 @@ public class ExecutorService extends BaseService{
TaskDependType
nodeDep
,
FailureStrategy
failureStrategy
,
String
startNodeList
,
String
schedule
,
WarningType
warningType
,
int
excutorId
,
int
warningGroupId
,
RunMode
runMode
,
Priority
processInstancePriority
)
throws
ParseException
{
RunMode
runMode
,
Priority
processInstancePriority
,
int
workerGroupId
)
throws
ParseException
{
/**
* instantiate command schedule instance
...
...
@@ -436,6 +436,7 @@ public class ExecutorService extends BaseService{
command
.
setExecutorId
(
excutorId
);
command
.
setWarningGroupId
(
warningGroupId
);
command
.
setProcessInstancePriority
(
processInstancePriority
);
command
.
setWorkerGroupId
(
workerGroupId
);
Date
start
=
null
;
Date
end
=
null
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录