Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
fa0b86ac
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
703
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
fa0b86ac
编写于
9月 16, 2021
作者:
K
Kirs
提交者:
GitHub
9月 16, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix][Registry]server listener err (#6232)
* [Fix][Registry]server listener err
上级
5fead427
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
8 deletion
+11
-8
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/ServerNodeManager.java
...inscheduler/server/master/registry/ServerNodeManager.java
+10
-6
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java
...cheduler/server/worker/registry/WorkerRegistryClient.java
+1
-2
未找到文件。
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/ServerNodeManager.java
浏览文件 @
fa0b86ac
...
...
@@ -106,6 +106,11 @@ public class ServerNodeManager implements InitializingBean {
*/
private
RegistryClient
registryClient
=
RegistryClient
.
getInstance
();
/**
* eg : /node/worker/group/127.0.0.1:xxx
*/
private
static
final
int
WORKER_LISTENER_CHECK_LENGTH
=
5
;
/**
* worker group mapper
*/
...
...
@@ -155,7 +160,7 @@ public class ServerNodeManager implements InitializingBean {
/**
* init WorkerNodeListener listener
*/
registryClient
.
subscribe
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
,
new
Mast
erDataListener
());
registryClient
.
subscribe
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
,
new
Work
erDataListener
());
}
/**
...
...
@@ -210,7 +215,7 @@ public class ServerNodeManager implements InitializingBean {
/**
* worker group node listener
*/
class
Worker
GroupNode
Listener
implements
SubscribeListener
{
class
Worker
Data
Listener
implements
SubscribeListener
{
@Override
public
void
notify
(
String
path
,
DataChangeEvent
dataChangeEvent
)
{
...
...
@@ -240,7 +245,7 @@ public class ServerNodeManager implements InitializingBean {
private
String
parseGroup
(
String
path
)
{
String
[]
parts
=
path
.
split
(
"/"
);
if
(
parts
.
length
<
6
)
{
if
(
parts
.
length
<
WORKER_LISTENER_CHECK_LENGTH
)
{
throw
new
IllegalArgumentException
(
String
.
format
(
"worker group path : %s is not valid, ignore"
,
path
));
}
return
parts
[
parts
.
length
-
2
];
...
...
@@ -306,8 +311,7 @@ public class ServerNodeManager implements InitializingBean {
/**
* sync master nodes
*
* @param nodes master nodes
* @param masterNodes
* @param nodes master nodes
*/
private
void
syncMasterNodes
(
Set
<
String
>
nodes
,
List
<
Server
>
masterNodes
)
{
masterLock
.
lock
();
...
...
@@ -332,7 +336,7 @@ public class ServerNodeManager implements InitializingBean {
* sync worker group nodes
*
* @param workerGroup worker group
* @param nodes
worker nodes
* @param nodes worker nodes
*/
private
void
syncWorkerGroupNodes
(
String
workerGroup
,
Set
<
String
>
nodes
)
{
workerGroupLock
.
lock
();
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java
浏览文件 @
fa0b86ac
...
...
@@ -131,11 +131,10 @@ public class WorkerRegistryClient {
public
Set
<
String
>
getWorkerZkPaths
()
{
Set
<
String
>
workerPaths
=
Sets
.
newHashSet
();
String
address
=
getLocalAddress
();
String
workerZkPathPrefix
=
REGISTRY_DOLPHINSCHEDULER_WORKERS
;
for
(
String
workGroup
:
this
.
workerGroups
)
{
StringJoiner
workerPathJoiner
=
new
StringJoiner
(
SINGLE_SLASH
);
workerPathJoiner
.
add
(
workerZkPathPrefix
);
workerPathJoiner
.
add
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
);
if
(
StringUtils
.
isEmpty
(
workGroup
))
{
workGroup
=
DEFAULT_WORKER_GROUP
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录