Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lhongjum2003
DolphinScheduler
提交
fd89dff3
DolphinScheduler
项目概览
lhongjum2003
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
2
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,发现更多精彩内容 >>
提交
fd89dff3
编写于
7月 09, 2019
作者:
leon-baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor ResInfo
上级
beaa6c6a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
59 addition
and
51 deletion
+59
-51
escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java
...va/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java
+0
-2
escheduler-common/src/main/java/cn/escheduler/common/utils/IpUtils.java
...mon/src/main/java/cn/escheduler/common/utils/IpUtils.java
+0
-6
escheduler-common/src/test/java/cn/escheduler/common/queue/TaskQueueImplTest.java
...st/java/cn/escheduler/common/queue/TaskQueueImplTest.java
+0
-2
escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java
...src/test/java/cn/escheduler/common/utils/IpUtilsTest.java
+41
-0
escheduler-server/src/main/java/cn/escheduler/server/ResInfo.java
...er-server/src/main/java/cn/escheduler/server/ResInfo.java
+10
-0
escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java
...src/main/java/cn/escheduler/server/zk/ZKMasterClient.java
+6
-22
escheduler-server/src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java
...src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java
+2
-19
未找到文件。
escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java
浏览文件 @
fd89dff3
...
...
@@ -20,8 +20,6 @@ public class ZookeeperMonitorUtilsTest {
List
<
MasterServer
>
workerServerList
=
zookeeperMonitor
.
getWorkerServers
();
System
.
out
.
println
(
"master:"
+
masterServerList
);
System
.
out
.
println
(
"worker:"
+
workerServerList
);
Assert
.
assertEquals
(
masterServerList
.
size
(),
1
);
Assert
.
assertEquals
(
workerServerList
.
size
(),
1
);
...
...
escheduler-common/src/main/java/cn/escheduler/common/utils/IpUtils.java
浏览文件 @
fd89dff3
...
...
@@ -61,10 +61,4 @@ public class IpUtils {
return
sb
.
toString
();
}
public
static
void
main
(
String
[]
args
){
long
ipLong
=
ipToLong
(
"11.3.4.5"
);
logger
.
info
(
longToIp
(
ipLong
));
}
}
escheduler-common/src/test/java/cn/escheduler/common/queue/TaskQueueImplTest.java
浏览文件 @
fd89dff3
...
...
@@ -20,13 +20,11 @@ import cn.escheduler.common.Constants;
import
cn.escheduler.common.utils.IpUtils
;
import
cn.escheduler.common.utils.OSUtils
;
import
org.junit.After
;
import
org.junit.Assert
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Random
;
...
...
escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java
0 → 100644
浏览文件 @
fd89dff3
package
cn.escheduler.common.utils
;
import
org.junit.Assert
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.*;
public
class
IpUtilsTest
{
@Test
public
void
ipToLong
()
{
String
ip
=
"192.168.110.1"
;
String
ip2
=
"0.0.0.0"
;
long
longNumber
=
IpUtils
.
ipToLong
(
ip
);
long
longNumber2
=
IpUtils
.
ipToLong
(
ip2
);
System
.
out
.
println
(
longNumber
);
Assert
.
assertEquals
(
longNumber
,
3232263681L
);
Assert
.
assertEquals
(
longNumber2
,
0L
);
String
ip3
=
"255.255.255.255"
;
long
longNumber3
=
IpUtils
.
ipToLong
(
ip3
);
System
.
out
.
println
(
longNumber3
);
Assert
.
assertEquals
(
longNumber3
,
4294967295L
);
}
@Test
public
void
longToIp
()
{
String
ip
=
"192.168.110.1"
;
String
ip2
=
"0.0.0.0"
;
long
longNum
=
3232263681L
;
String
i1
=
IpUtils
.
longToIp
(
longNum
);
String
i2
=
IpUtils
.
longToIp
(
0
);
Assert
.
assertEquals
(
ip
,
i1
);
Assert
.
assertEquals
(
ip2
,
i2
);
}
}
\ No newline at end of file
escheduler-server/src/main/java/cn/escheduler/server/ResInfo.java
浏览文件 @
fd89dff3
...
...
@@ -102,6 +102,16 @@ public class ResInfo {
}
public
static
String
getHeartBeatInfo
(
Date
now
){
return
buildHeartbeatForZKInfo
(
OSUtils
.
getHost
(),
OSUtils
.
getProcessID
(),
OSUtils
.
cpuUsage
(),
OSUtils
.
memoryUsage
(),
DateUtils
.
dateToString
(
now
),
DateUtils
.
dateToString
(
now
));
}
/**
* build heartbeat info for zk
* @param host
...
...
escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java
浏览文件 @
fd89dff3
...
...
@@ -204,7 +204,7 @@ public class ZKMasterClient extends AbstractZKClient {
}
// specify the format of stored data in ZK nodes
String
heartbeatZKInfo
=
getOs
Info
(
now
);
String
heartbeatZKInfo
=
ResInfo
.
getHeartBeat
Info
(
now
);
// create temporary sequence nodes for master znode
masterZNode
=
zkClient
.
create
().
withMode
(
CreateMode
.
EPHEMERAL_SEQUENTIAL
).
forPath
(
masterZNodeParentPath
+
"/"
+
OSUtils
.
getHost
()
+
"_"
,
heartbeatZKInfo
.
getBytes
());
...
...
@@ -259,10 +259,10 @@ public class ZKMasterClient extends AbstractZKClient {
return
false
;
}
List
<
String
>
masterZNode
List
=
null
;
masterZNode
List
=
zkClient
.
getChildren
().
forPath
(
path
);
if
(
CollectionUtils
.
isNotEmpty
(
masterZNode
List
)){
for
(
String
masterZNode
:
masterZNode
List
){
List
<
String
>
server
List
=
null
;
server
List
=
zkClient
.
getChildren
().
forPath
(
path
);
if
(
CollectionUtils
.
isNotEmpty
(
server
List
)){
for
(
String
masterZNode
:
server
List
){
if
(
masterZNode
.
startsWith
(
host
)){
return
true
;
}
...
...
@@ -423,22 +423,6 @@ public class ZKMasterClient extends AbstractZKClient {
}
/**
* get os info
* @param now
* @return
*/
private
String
getOsInfo
(
Date
now
)
{
return
ResInfo
.
buildHeartbeatForZKInfo
(
OSUtils
.
getHost
(),
OSUtils
.
getProcessID
(),
OSUtils
.
cpuUsage
(),
OSUtils
.
memoryUsage
(),
DateUtils
.
dateToString
(
now
),
DateUtils
.
dateToString
(
now
));
}
/**
* get master znode
* @return
...
...
@@ -541,7 +525,7 @@ public class ZKMasterClient extends AbstractZKClient {
}
/**
* get host ip
* get host ip
, string format: masterParentPath/ip_000001/value
* @param path
* @return
*/
...
...
escheduler-server/src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java
浏览文件 @
fd89dff3
...
...
@@ -116,11 +116,10 @@ public class ZKWorkerClient extends AbstractZKClient {
public
String
initWorkZNode
()
throws
Exception
{
Date
now
=
new
Date
();
String
heartbeatZKInfo
=
getOsInfo
(
now
);
String
heartbeatZKInfo
=
ResInfo
.
getHeartBeatInfo
(
new
Date
());
workerZNode
=
workerZNodeParentPath
+
"/"
+
OSUtils
.
getHost
()
+
"_"
;
workerZNode
=
zkClient
.
create
().
withMode
(
CreateMode
.
EPHEMERAL_SEQUENTIAL
).
forPath
(
workerZNode
,
heartbeatZKInfo
.
getBytes
());
logger
.
info
(
"register worker node {} success"
,
workerZNode
);
...
...
@@ -141,7 +140,6 @@ public class ZKWorkerClient extends AbstractZKClient {
workerZNode
=
workerZNodeParentPath
+
"/"
+
OSUtils
.
getHost
()
+
"_"
;
List
<
String
>
workerZNodeList
=
zkClient
.
getChildren
().
forPath
(
workerZNodeParentPath
);
if
(
CollectionUtils
.
isNotEmpty
(
workerZNodeList
)){
boolean
flag
=
false
;
for
(
String
workerZNode
:
workerZNodeList
){
...
...
@@ -241,21 +239,6 @@ public class ZKWorkerClient extends AbstractZKClient {
}
/**
* get os info
* @param now
* @return
*/
private
String
getOsInfo
(
Date
now
)
{
return
ResInfo
.
buildHeartbeatForZKInfo
(
OSUtils
.
getHost
(),
OSUtils
.
getProcessID
(),
OSUtils
.
cpuUsage
(),
OSUtils
.
memoryUsage
(),
DateUtils
.
dateToString
(
now
),
DateUtils
.
dateToString
(
now
));
}
/**
* get worker znode
* @return
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录