Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
445b08c4
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
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,发现更多精彩内容 >>
未验证
提交
445b08c4
编写于
8月 24, 2022
作者:
J
JiPeng Wang
提交者:
GitHub
8月 24, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #74 from insist777/default-worker-group
Skip default group name check
上级
7afc7a1c
5c3ecc00
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
2 deletion
+6
-2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
...hinscheduler/api/service/impl/WorkerGroupServiceImpl.java
+6
-2
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
浏览文件 @
445b08c4
...
@@ -118,12 +118,12 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
...
@@ -118,12 +118,12 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
putMsg
(
result
,
Status
.
WORKER_ADDRESS_INVALID
,
invalidAddr
);
putMsg
(
result
,
Status
.
WORKER_ADDRESS_INVALID
,
invalidAddr
);
return
result
;
return
result
;
}
}
handleDefault
WorkGroup
(
workerGroupMapper
,
workerGroup
,
loginUser
,
otherParamsJson
);
save
WorkGroup
(
workerGroupMapper
,
workerGroup
,
loginUser
,
otherParamsJson
);
putMsg
(
result
,
Status
.
SUCCESS
);
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
return
result
;
}
}
protected
void
handleDefault
WorkGroup
(
WorkerGroupMapper
workerGroupMapper
,
WorkerGroup
workerGroup
,
User
loginUser
,
String
otherParamsJson
)
{
protected
void
save
WorkGroup
(
WorkerGroupMapper
workerGroupMapper
,
WorkerGroup
workerGroup
,
User
loginUser
,
String
otherParamsJson
)
{
if
(
workerGroup
.
getId
()
!=
0
)
{
if
(
workerGroup
.
getId
()
!=
0
)
{
workerGroupMapper
.
updateById
(
workerGroup
);
workerGroupMapper
.
updateById
(
workerGroup
);
}
else
{
}
else
{
...
@@ -152,6 +152,10 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
...
@@ -152,6 +152,10 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
}
}
}
}
}
}
// skip default group name check
if
(
Constants
.
DEFAULT
.
equals
(
workerGroup
.
getName
()))
{
return
false
;
}
// check zookeeper
// check zookeeper
String
workerGroupPath
=
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
+
Constants
.
SINGLE_SLASH
+
workerGroup
.
getName
();
String
workerGroupPath
=
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
+
Constants
.
SINGLE_SLASH
+
workerGroup
.
getName
();
return
registryClient
.
exists
(
workerGroupPath
);
return
registryClient
.
exists
(
workerGroupPath
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录