Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
f5087886
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
705
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 搜索 >>
未验证
提交
f5087886
编写于
6月 24, 2021
作者:
K
Kirs
提交者:
GitHub
6月 24, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[BUG-#5678][Registry]fix registry init node miss (#5686)
上级
93f1d4df
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
54 deletion
+22
-54
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java
...cheduler/server/master/registry/MasterRegistryClient.java
+2
-14
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/ServerNodeManager.java
...inscheduler/server/master/registry/ServerNodeManager.java
+5
-2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java
...cheduler/server/worker/registry/WorkerRegistryClient.java
+2
-1
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClientTest.java
...uler/server/worker/registry/WorkerRegistryClientTest.java
+0
-2
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryCenter.java
...che/dolphinscheduler/service/registry/RegistryCenter.java
+8
-32
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryClient.java
...che/dolphinscheduler/service/registry/RegistryClient.java
+5
-3
未找到文件。
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java
浏览文件 @
f5087886
...
...
@@ -17,6 +17,7 @@
package
org.apache.dolphinscheduler.server.master.registry
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_MASTERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_NODE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
SLEEP_TIME_MILLIS
;
...
...
@@ -134,18 +135,6 @@ public class MasterRegistryClient {
unRegistry
();
}
/**
* init system node
*/
private
void
initMasterSystemNode
()
{
try
{
registryClient
.
persist
(
Constants
.
REGISTRY_DOLPHINSCHEDULER_DEAD_SERVERS
,
""
);
logger
.
info
(
"initialize master server nodes success."
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"init system node failed"
,
e
);
}
}
/**
* remove zookeeper node path
*
...
...
@@ -346,7 +335,6 @@ public class MasterRegistryClient {
* registry
*/
public
void
registry
()
{
initMasterSystemNode
();
String
address
=
NetUtils
.
getAddr
(
masterConfig
.
getListenPort
());
localNodePath
=
getMasterPath
();
registryClient
.
persistEphemeral
(
localNodePath
,
""
);
...
...
@@ -395,7 +383,7 @@ public class MasterRegistryClient {
*/
public
String
getMasterPath
()
{
String
address
=
getLocalAddress
();
return
registryClient
.
getMasterPath
()
+
"/"
+
address
;
return
REGISTRY_DOLPHINSCHEDULER_MASTERS
+
"/"
+
address
;
}
/**
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/ServerNodeManager.java
浏览文件 @
f5087886
...
...
@@ -17,6 +17,9 @@
package
org.apache.dolphinscheduler.server.master.registry
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_MASTERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.NodeType
;
import
org.apache.dolphinscheduler.common.utils.StringUtils
;
...
...
@@ -131,11 +134,11 @@ public class ServerNodeManager implements InitializingBean {
/**
* init MasterNodeListener listener
*/
registryClient
.
subscribe
(
registryClient
.
getMasterPath
()
,
new
MasterDataListener
());
registryClient
.
subscribe
(
REGISTRY_DOLPHINSCHEDULER_MASTERS
,
new
MasterDataListener
());
/**
* init WorkerNodeListener listener
*/
registryClient
.
subscribe
(
registryClient
.
getWorkerPath
()
,
new
MasterDataListener
());
registryClient
.
subscribe
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
,
new
MasterDataListener
());
}
/**
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java
浏览文件 @
f5087886
...
...
@@ -18,6 +18,7 @@
package
org.apache.dolphinscheduler.server.worker.registry
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
DEFAULT_WORKER_GROUP
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
SLASH
;
import
org.apache.dolphinscheduler.common.Constants
;
...
...
@@ -130,7 +131,7 @@ public class WorkerRegistryClient {
public
Set
<
String
>
getWorkerZkPaths
()
{
Set
<
String
>
workerPaths
=
Sets
.
newHashSet
();
String
address
=
getLocalAddress
();
String
workerZkPathPrefix
=
registryClient
.
getWorkerPath
()
;
String
workerZkPathPrefix
=
REGISTRY_DOLPHINSCHEDULER_WORKERS
;
for
(
String
workGroup
:
this
.
workerGroups
)
{
StringJoiner
workerPathJoiner
=
new
StringJoiner
(
SLASH
);
...
...
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClientTest.java
浏览文件 @
f5087886
...
...
@@ -71,8 +71,6 @@ public class WorkerRegistryClientTest {
@Before
public
void
before
()
{
given
(
registryClient
.
getWorkerPath
()).
willReturn
(
"/nodes/worker"
);
given
(
workerConfig
.
getWorkerGroups
()).
willReturn
(
Sets
.
newHashSet
(
"127.0.0.1"
));
//given(heartBeatExecutor.getWorkerGroups()).willReturn(Sets.newHashSet("127.0.0.1"));
//scheduleAtFixedRate
...
...
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryCenter.java
浏览文件 @
f5087886
...
...
@@ -18,6 +18,8 @@
package
org.apache.dolphinscheduler.service.registry
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_DEAD_SERVERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_MASTERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
;
import
org.apache.dolphinscheduler.common.IStoppable
;
import
org.apache.dolphinscheduler.common.utils.PropertyUtils
;
...
...
@@ -57,16 +59,7 @@ public class RegistryCenter {
*/
protected
static
String
NODES
;
/**
* master path
*/
protected
static
String
MASTER_PATH
=
"/nodes/master"
;
private
RegistryPluginManager
registryPluginManager
;
/**
* worker path
*/
protected
static
String
WORKER_PATH
=
"/nodes/worker"
;
protected
static
final
String
EMPTY
=
""
;
...
...
@@ -113,8 +106,9 @@ public class RegistryCenter {
* init nodes
*/
private
void
initNodes
()
{
persist
(
MASTER_PATH
,
EMPTY
);
persist
(
WORKER_PATH
,
EMPTY
);
persist
(
REGISTRY_DOLPHINSCHEDULER_MASTERS
,
EMPTY
);
persist
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
,
EMPTY
);
persist
(
REGISTRY_DOLPHINSCHEDULER_DEAD_SERVERS
,
EMPTY
);
}
/**
...
...
@@ -205,15 +199,6 @@ public class RegistryCenter {
return
stoppable
;
}
/**
* get master path
*
* @return master path
*/
public
String
getMasterPath
()
{
return
MASTER_PATH
;
}
/**
* whether master path
*
...
...
@@ -221,16 +206,7 @@ public class RegistryCenter {
* @return result
*/
public
boolean
isMasterPath
(
String
path
)
{
return
path
!=
null
&&
path
.
contains
(
MASTER_PATH
);
}
/**
* get worker path
*
* @return worker path
*/
public
String
getWorkerPath
()
{
return
WORKER_PATH
;
return
path
!=
null
&&
path
.
contains
(
REGISTRY_DOLPHINSCHEDULER_MASTERS
);
}
/**
...
...
@@ -240,7 +216,7 @@ public class RegistryCenter {
* @return worker group path
*/
public
String
getWorkerGroupPath
(
String
workerGroup
)
{
return
WORKER_PATH
+
"/"
+
workerGroup
;
return
REGISTRY_DOLPHINSCHEDULER_WORKERS
+
"/"
+
workerGroup
;
}
/**
...
...
@@ -250,7 +226,7 @@ public class RegistryCenter {
* @return result
*/
public
boolean
isWorkerPath
(
String
path
)
{
return
path
!=
null
&&
path
.
contains
(
WORKER_PATH
);
return
path
!=
null
&&
path
.
contains
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
);
}
/**
...
...
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryClient.java
浏览文件 @
f5087886
...
...
@@ -22,6 +22,8 @@ import static org.apache.dolphinscheduler.common.Constants.COLON;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
DELETE_OP
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
DIVISION_STRING
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
MASTER_TYPE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_MASTERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
REGISTRY_DOLPHINSCHEDULER_WORKERS
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
SINGLE_SLASH
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
UNDERLINE
;
import
static
org
.
apache
.
dolphinscheduler
.
common
.
Constants
.
WORKER_TYPE
;
...
...
@@ -344,7 +346,7 @@ public class RegistryClient extends RegistryCenter {
* @return master nodes
*/
public
Set
<
String
>
getMasterNodesDirectly
()
{
List
<
String
>
masters
=
getChildrenKeys
(
MASTER_PATH
);
List
<
String
>
masters
=
getChildrenKeys
(
REGISTRY_DOLPHINSCHEDULER_MASTERS
);
return
new
HashSet
<>(
masters
);
}
...
...
@@ -354,7 +356,7 @@ public class RegistryClient extends RegistryCenter {
* @return master nodes
*/
public
Set
<
String
>
getWorkerNodesDirectly
()
{
List
<
String
>
workers
=
getChildrenKeys
(
WORKER_PATH
);
List
<
String
>
workers
=
getChildrenKeys
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
);
return
new
HashSet
<>(
workers
);
}
...
...
@@ -364,7 +366,7 @@ public class RegistryClient extends RegistryCenter {
* @return worker group nodes
*/
public
Set
<
String
>
getWorkerGroupDirectly
()
{
List
<
String
>
workers
=
getChildrenKeys
(
getWorkerPath
()
);
List
<
String
>
workers
=
getChildrenKeys
(
REGISTRY_DOLPHINSCHEDULER_WORKERS
);
return
new
HashSet
<>(
workers
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录