Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wk1234123
DolphinScheduler
提交
fb90fcea
DolphinScheduler
项目概览
wk1234123
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
5
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,发现更多精彩内容 >>
提交
fb90fcea
编写于
9月 01, 2019
作者:
L
lidongdai
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/dev' into dev
上级
47cd275f
58879c7d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
4 deletion
+8
-4
escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java
...java/cn/escheduler/api/controller/ExecutorController.java
+2
-2
escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java
...c/main/java/cn/escheduler/common/zk/AbstractZKClient.java
+3
-0
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
...nf/home/pages/resource/pages/file/pages/_source/common.js
+1
-1
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js
.../pages/resource/pages/file/pages/details/_source/utils.js
+2
-1
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java
浏览文件 @
fb90fcea
...
@@ -92,8 +92,8 @@ public class ExecutorController extends BaseController {
...
@@ -92,8 +92,8 @@ public class ExecutorController extends BaseController {
logger
.
info
(
"login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
logger
.
info
(
"login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
+
"failure policy: {}, node name: {}, node dep: {}, notify type: {}, "
+
"failure policy: {}, node name: {}, node dep: {}, notify type: {}, "
+
"notify group id: {},receivers:{},receiversCc:{}, run mode: {},process instance priority:{}, workerGroupId: {}, timeout: {}"
,
+
"notify group id: {},receivers:{},receiversCc:{}, run mode: {},process instance priority:{}, workerGroupId: {}, timeout: {}"
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
,
scheduleTime
,
failureStrategy
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
,
scheduleTime
,
taskDependType
,
warningType
,
warningGroupId
,
receivers
,
receiversCc
,
runMode
,
processInstancePriority
,
failureStrategy
,
startNodeList
,
taskDependType
,
warningType
,
warningGroupId
,
receivers
,
receiversCc
,
runMode
,
processInstancePriority
,
workerGroupId
,
timeout
);
workerGroupId
,
timeout
);
if
(
timeout
==
null
)
{
if
(
timeout
==
null
)
{
...
...
escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java
浏览文件 @
fb90fcea
...
@@ -344,9 +344,12 @@ public abstract class AbstractZKClient {
...
@@ -344,9 +344,12 @@ public abstract class AbstractZKClient {
String
parentPath
=
getZNodeParentPath
(
zkNodeType
);
String
parentPath
=
getZNodeParentPath
(
zkNodeType
);
List
<
MasterServer
>
masterServers
=
new
ArrayList
<>();
List
<
MasterServer
>
masterServers
=
new
ArrayList
<>();
int
i
=
0
;
for
(
String
path
:
masterMap
.
keySet
()){
for
(
String
path
:
masterMap
.
keySet
()){
MasterServer
masterServer
=
ResInfo
.
parseHeartbeatForZKInfo
(
masterMap
.
get
(
path
));
MasterServer
masterServer
=
ResInfo
.
parseHeartbeatForZKInfo
(
masterMap
.
get
(
path
));
masterServer
.
setZkDirectory
(
parentPath
+
"/"
+
path
);
masterServer
.
setZkDirectory
(
parentPath
+
"/"
+
path
);
masterServer
.
setId
(
i
);
i
++;
masterServers
.
add
(
masterServer
);
masterServers
.
add
(
masterServer
);
}
}
return
masterServers
;
return
masterServers
;
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
浏览文件 @
fb90fcea
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
/**
/**
* Create file type
* Create file type
*/
*/
let
filtTypeArr
=
[
'
txt
'
,
'
log
'
,
'
sh
'
,
'
conf
'
,
'
cfg
'
,
'
py
'
,
'
java
'
,
'
sql
'
,
'
xml
'
,
'
hql
'
]
let
filtTypeArr
=
[
'
txt
'
,
'
log
'
,
'
sh
'
,
'
conf
'
,
'
cfg
'
,
'
py
'
,
'
java
'
,
'
sql
'
,
'
xml
'
,
'
hql
'
,
'
properties
'
]
export
{
filtTypeArr
}
export
{
filtTypeArr
}
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js
浏览文件 @
fb90fcea
...
@@ -28,7 +28,8 @@ const handlerSuffix = {
...
@@ -28,7 +28,8 @@ const handlerSuffix = {
'
.java
'
:
'
textile
'
,
'
.java
'
:
'
textile
'
,
'
.sql
'
:
'
sql
'
,
'
.sql
'
:
'
sql
'
,
'
.hql
'
:
'
sql
'
,
'
.hql
'
:
'
sql
'
,
'
.xml
'
:
'
xml
'
'
.xml
'
:
'
xml
'
,
'
.properties
'
:
'
textile
'
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录