Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
e3cf72cb
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
e3cf72cb
编写于
11月 14, 2022
作者:
K
Kerwin
提交者:
GitHub
11月 14, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix-12832][API] Fix update worker group exception group name already exists. (#12874)
上级
250d81bc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
23 deletion
+11
-23
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
...hinscheduler/api/service/impl/WorkerGroupServiceImpl.java
+11
-17
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
.../dolphinscheduler/api/service/WorkerGroupServiceTest.java
+0
-6
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
浏览文件 @
e3cf72cb
...
...
@@ -113,15 +113,11 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
return
result
;
}
Date
now
=
new
Date
();
WorkerGroup
workerGroup
;
WorkerGroup
workerGroup
=
null
;
if
(
id
!=
0
)
{
workerGroup
=
workerGroupMapper
.
selectById
(
id
);
// check exist
if
(
workerGroup
==
null
)
{
workerGroup
=
new
WorkerGroup
();
workerGroup
.
setCreateTime
(
now
);
}
}
else
{
}
if
(
workerGroup
==
null
)
{
workerGroup
=
new
WorkerGroup
();
workerGroup
.
setCreateTime
(
now
);
}
...
...
@@ -165,23 +161,21 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
* @return boolean
*/
private
boolean
checkWorkerGroupNameExists
(
WorkerGroup
workerGroup
)
{
// check database
List
<
WorkerGroup
>
workerGroupList
=
workerGroupMapper
.
queryWorkerGroupByName
(
workerGroup
.
getName
());
if
(
CollectionUtils
.
isNotEmpty
(
workerGroupList
))
{
//
new group has same nam
e
//
create group, the same group name exists in the databas
e
if
(
workerGroup
.
getId
()
==
null
)
{
return
true
;
}
//
check group id
for
(
WorkerGroup
group
:
workerGroupList
)
{
if
(
Objects
.
equals
(
group
.
getId
(),
workerGroup
.
getId
()))
{
return
true
;
}
//
update group, the database exists with the same group name except itself
Optional
<
WorkerGroup
>
sameNameWorkGroupOptional
=
workerGroupList
.
stream
()
.
filter
(
group
->
!
Objects
.
equals
(
group
.
getId
(),
workerGroup
.
getId
())).
findFirst
();
if
(
sameNameWorkGroupOptional
.
isPresent
())
{
return
true
;
}
}
// check zookeeper
String
workerGroupPath
=
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
+
Constants
.
SINGLE_SLASH
+
workerGroup
.
getName
();
return
registryClient
.
exists
(
workerGroupPath
);
return
false
;
}
/**
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
浏览文件 @
e3cf72cb
...
...
@@ -153,9 +153,6 @@ public class WorkerGroupServiceTest {
baseServiceLogger
)).
thenReturn
(
true
);
Mockito
.
when
(
workerGroupMapper
.
selectById
(
1
)).
thenReturn
(
null
);
Mockito
.
when
(
workerGroupMapper
.
queryWorkerGroupByName
(
GROUP_NAME
)).
thenReturn
(
null
);
String
workerGroupPath
=
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
+
Constants
.
SINGLE_SLASH
+
GROUP_NAME
;
Mockito
.
when
(
registryClient
.
exists
(
workerGroupPath
)).
thenReturn
(
false
);
Map
<
String
,
String
>
serverMaps
=
new
HashMap
<>();
serverMaps
.
put
(
"localhost1:0000"
,
""
);
Mockito
.
when
(
registryClient
.
getServerMaps
(
NodeType
.
WORKER
)).
thenReturn
(
serverMaps
);
...
...
@@ -176,9 +173,6 @@ public class WorkerGroupServiceTest {
Mockito
.
when
(
workerGroupMapper
.
selectById
(
1
)).
thenReturn
(
null
);
Mockito
.
when
(
workerGroupMapper
.
queryWorkerGroupByName
(
GROUP_NAME
)).
thenReturn
(
null
);
String
workerGroupPath
=
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
+
Constants
.
SINGLE_SLASH
+
GROUP_NAME
;
Mockito
.
when
(
registryClient
.
exists
(
workerGroupPath
)).
thenReturn
(
false
);
Map
<
String
,
String
>
serverMaps
=
new
HashMap
<>();
serverMaps
.
put
(
"localhost:0000"
,
""
);
Mockito
.
when
(
registryClient
.
getServerMaps
(
NodeType
.
WORKER
)).
thenReturn
(
serverMaps
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录