Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
842c5400
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 搜索 >>
未验证
提交
842c5400
编写于
5月 25, 2021
作者:
R
ruanwenjun
提交者:
GitHub
5月 25, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Improvement][Server] Must restart master if Zk reconnect (#5210) (#5211)
上级
9d0c816c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
9 deletion
+7
-9
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java
...lphinscheduler/server/master/registry/MasterRegistry.java
+0
-2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java
...lphinscheduler/server/worker/registry/WorkerRegistry.java
+0
-2
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperOperator.java
...apache/dolphinscheduler/service/zk/ZookeeperOperator.java
+7
-5
未找到文件。
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java
浏览文件 @
842c5400
...
...
@@ -90,10 +90,8 @@ public class MasterRegistry {
logger
.
error
(
"master : {} connection lost from zookeeper"
,
address
);
}
else
if
(
newState
==
ConnectionState
.
RECONNECTED
)
{
logger
.
info
(
"master : {} reconnected to zookeeper"
,
address
);
zookeeperRegistryCenter
.
getRegisterOperator
().
persistEphemeral
(
localNodePath
,
""
);
}
else
if
(
newState
==
ConnectionState
.
SUSPENDED
)
{
logger
.
warn
(
"master : {} connection SUSPENDED "
,
address
);
zookeeperRegistryCenter
.
getRegisterOperator
().
persistEphemeral
(
localNodePath
,
""
);
}
});
int
masterHeartbeatInterval
=
masterConfig
.
getMasterHeartbeatInterval
();
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java
浏览文件 @
842c5400
...
...
@@ -111,10 +111,8 @@ public class WorkerRegistry {
logger
.
error
(
"worker : {} connection lost from zookeeper"
,
address
);
}
else
if
(
newState
==
ConnectionState
.
RECONNECTED
)
{
logger
.
info
(
"worker : {} reconnected to zookeeper"
,
address
);
zookeeperRegistryCenter
.
getRegisterOperator
().
persistEphemeral
(
workerZKPath
,
""
);
}
else
if
(
newState
==
ConnectionState
.
SUSPENDED
)
{
logger
.
warn
(
"worker : {} connection SUSPENDED "
,
address
);
zookeeperRegistryCenter
.
getRegisterOperator
().
persistEphemeral
(
workerZKPath
,
""
);
}
});
logger
.
info
(
"worker node : {} registry to ZK {} successfully"
,
address
,
workerZKPath
);
...
...
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperOperator.java
浏览文件 @
842c5400
...
...
@@ -189,18 +189,20 @@ public class ZookeeperOperator implements InitializingBean {
}
}
public
void
persistEphemeral
(
final
String
key
,
final
String
value
)
{
public
void
persistEphemeral
(
final
String
path
,
final
String
value
)
{
try
{
if
(
isExisted
(
key
))
{
// If the ephemeral node exist and the data is not equals to the given value
// delete the old node
if
(
isExisted
(
path
)
&&
!
value
.
equals
(
get
(
path
)))
{
try
{
zkClient
.
delete
().
deletingChildrenIfNeeded
().
forPath
(
key
);
zkClient
.
delete
().
deletingChildrenIfNeeded
().
forPath
(
path
);
}
catch
(
NoNodeException
ignore
)
{
//NOP
}
}
zkClient
.
create
().
creatingParentsIfNeeded
().
withMode
(
CreateMode
.
EPHEMERAL
).
forPath
(
key
,
value
.
getBytes
(
StandardCharsets
.
UTF_8
));
zkClient
.
create
().
creatingParentsIfNeeded
().
withMode
(
CreateMode
.
EPHEMERAL
).
forPath
(
path
,
value
.
getBytes
(
StandardCharsets
.
UTF_8
));
}
catch
(
final
Exception
ex
)
{
logger
.
error
(
"persistEphemeral
key : {} , value : {}"
,
key
,
value
,
ex
);
logger
.
error
(
"persistEphemeral
path : {} , value : {}"
,
path
,
value
,
ex
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录