Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
48dc52a0
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
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,发现更多精彩内容 >>
提交
48dc52a0
编写于
7月 28, 2020
作者:
L
lenboo
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '1.3.2-release' of github.com:apache/incubator-dolphinscheduler into 132
上级
de819926
6b964be6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
9 deletion
+26
-9
dolphinscheduler-server/src/main/resources/worker.properties
dolphinscheduler-server/src/main/resources/worker.properties
+2
-2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
...r-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+17
-5
script/scp-hosts.sh
script/scp-hosts.sh
+7
-2
未找到文件。
dolphinscheduler-server/src/main/resources/worker.properties
浏览文件 @
48dc52a0
...
@@ -30,5 +30,5 @@
...
@@ -30,5 +30,5 @@
# worker listener port
# worker listener port
#worker.listen.port: 1234
#worker.listen.port: 1234
# default worker group
# default worker group
,if this worker belongs different groups,you can config the following like that `worker.groups=default,test`
#
worker.groups=default
worker.groups
=
default
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
浏览文件 @
48dc52a0
...
@@ -303,25 +303,26 @@
...
@@ -303,25 +303,26 @@
color
:
#0097e0
;
color
:
#0097e0
;
font-size
:
12px
;
font-size
:
12px
;
margin-left
:
10px
;
margin-left
:
10px
;
i
{
em
{
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
}
}
.clock
{
.clock
{
>
i
{
>
em
{
font-size
:
20px
;
font-size
:
20px
;
vertical-align
:
middle
;
vertical-align
:
middle
;
transform
:
scale
(
1
);
transform
:
scale
(
1
);
}
}
}
}
.refresh-log
{
.refresh-log
{
>
i
{
>
em
{
text-decoration
:
none
;
font-size
:
20px
;
font-size
:
20px
;
vertical-align
:
middle
;
vertical-align
:
middle
;
transform
:
scale
(
1
);
transform
:
scale
(
1
);
}
}
&
.active
{
&
.active
{
>
i
{
>
em
{
-webkit-transition-property
:
-
webkit-transform
;
-webkit-transition-property
:
-
webkit-transform
;
-webkit-transition-duration
:
1s
;
-webkit-transition-duration
:
1s
;
-moz-transition-property
:
-
moz-transform
;
-moz-transition-property
:
-
moz-transform
;
...
@@ -368,5 +369,16 @@
...
@@ -368,5 +369,16 @@
}
}
}
}
}
}
@-webkit-keyframes
rotateloading
{
from
{
-webkit-transform
:
rotate
(
0deg
)}
to
{
-webkit-transform
:
rotate
(
360deg
)}
}
@-moz-keyframes
rotateloading
{
from
{
-moz-transform
:
rotate
(
0deg
)}
to
{
-moz-transform
:
rotate
(
359deg
)}
}
@-o-keyframes
rotateloading
{
from
{
-o-transform
:
rotate
(
0deg
)}
to
{
-o-transform
:
rotate
(
359deg
)}
}
@keyframes
rotateloading
{
from
{
transform
:
rotate
(
0deg
)}
to
{
transform
:
rotate
(
359deg
)}
}
</
style
>
</
style
>
script/scp-hosts.sh
浏览文件 @
48dc52a0
...
@@ -34,7 +34,12 @@ do
...
@@ -34,7 +34,12 @@ do
echo
$workerGroup
;
echo
$workerGroup
;
worker
=
`
echo
$workerGroup
|awk
-F
':'
'{print $1}'
`
worker
=
`
echo
$workerGroup
|awk
-F
':'
'{print $1}'
`
groupName
=
`
echo
$workerGroup
|awk
-F
':'
'{print $2}'
`
groupName
=
`
echo
$workerGroup
|awk
-F
':'
'{print $2}'
`
workersGroupMap+
=([
$worker
]=
$groupName
)
if
[
-z
${
workersGroupMap
[
$worker
]
}
]
;
then
workersGroupMap+
=([
$worker
]=
$groupName
)
else
finalGroupName
=
"
${
workersGroupMap
[
$worker
]
}
,
$groupName
"
workersGroupMap[
$worker
]=
$finalGroupName
fi
done
done
...
@@ -53,7 +58,7 @@ do
...
@@ -53,7 +58,7 @@ do
do
do
# if worker in workersGroupMap
# if worker in workersGroupMap
if
[[
"
${
workersGroupMap
[
${
host
}
]
}
"
]]
&&
[[
"
${
dsDir
}
"
==
"conf"
]]
;
then
if
[[
"
${
workersGroupMap
[
${
host
}
]
}
"
]]
&&
[[
"
${
dsDir
}
"
==
"conf"
]]
;
then
sed
-i
${
txt
}
"s#worker.group
.*#worker.group
=
${
workersGroupMap
[
${
host
}
]
}
#g"
${
dsDir
}
/worker.properties
sed
-i
${
txt
}
"s#worker.group
s.*#worker.groups
=
${
workersGroupMap
[
${
host
}
]
}
#g"
${
dsDir
}
/worker.properties
fi
fi
echo
"start to scp
$dsDir
to
$host
/
$installPath
"
echo
"start to scp
$dsDir
to
$host
/
$installPath
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录