You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2020/05/06 05:56:13 UTC
[incubator-dolphinscheduler] branch dev updated: Zookeeper
management interface in monitoring center displays abnormal #2547 (#2595)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new c3353c2 Zookeeper management interface in monitoring center displays abnormal #2547 (#2595)
c3353c2 is described below
commit c3353c2b5e63b272006198208544d1608f9a722c
Author: tlhhup <13...@qq.com>
AuthorDate: Wed May 6 13:56:05 2020 +0800
Zookeeper management interface in monitoring center displays abnormal #2547 (#2595)
Co-authored-by: dailidong <da...@gmail.com>
---
docker/docker-compose.yml | 1 +
.../dolphinscheduler/api/utils/ZooKeeperState.java | 14 +++++++-------
.../dolphinscheduler/api/utils/ZookeeperMonitor.java | 6 +++---
.../dolphinscheduler/dao/entity/ZookeeperRecord.java | 18 +++++++++---------
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7e9c4e5..26ffb5b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,6 +23,7 @@ services:
- "2181:2181"
environment:
ZOO_MY_ID: 1
+ ZOO_4LW_COMMANDS_WHITELIST: srvr,ruok,wchs,cons
db:
image: postgres
container_name: postgres
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
index a337543..55bb3d3 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
@@ -33,7 +33,7 @@ public class ZooKeeperState {
private final String host;
private final int port;
- private int minLatency = -1, avgLatency = -1, maxLatency = -1;
+ private float minLatency = -1, avgLatency = -1, maxLatency = -1;
private long received = -1;
private long sent = -1;
private int outStanding = -1;
@@ -60,9 +60,9 @@ public class ZooKeeperState {
String line = scannerForStat.nextLine();
if (line.startsWith("Latency min/avg/max:")) {
String[] latencys = getStringValueFromLine(line).split("/");
- minLatency = Integer.parseInt(latencys[0]);
- avgLatency = Integer.parseInt(latencys[1]);
- maxLatency = Integer.parseInt(latencys[2]);
+ minLatency = Float.parseFloat(latencys[0]);
+ avgLatency = Float.parseFloat(latencys[1]);
+ maxLatency = Float.parseFloat(latencys[2]);
} else if (line.startsWith("Received:")) {
received = Long.parseLong(getStringValueFromLine(line));
} else if (line.startsWith("Sent:")) {
@@ -165,15 +165,15 @@ public class ZooKeeperState {
return port;
}
- public int getMinLatency() {
+ public float getMinLatency() {
return minLatency;
}
- public int getAvgLatency() {
+ public float getAvgLatency() {
return avgLatency;
}
- public int getMaxLatency() {
+ public float getMaxLatency() {
return maxLatency;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java
index f91d3bc..7ba7049 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java
@@ -88,9 +88,9 @@ public class ZookeeperMonitor extends AbstractZKClient {
long sent = state.getSent();
long received = state.getReceived();
String mode = state.getMode();
- int minLatency = state.getMinLatency();
- int avgLatency = state.getAvgLatency();
- int maxLatency = state.getMaxLatency();
+ float minLatency = state.getMinLatency();
+ float avgLatency = state.getAvgLatency();
+ float maxLatency = state.getMaxLatency();
int nodeCount = state.getNodeCount();
int status = ok ? 1 : 0;
Date date = new Date();
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java
index 6b86ac5..7d45c66 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java
@@ -56,17 +56,17 @@ public class ZookeeperRecord {
/**
* min Latency
*/
- private int minLatency;
+ private float minLatency;
/**
* avg Latency
*/
- private int avgLatency;
+ private float avgLatency;
/**
* max Latency
*/
- private int maxLatency;
+ private float maxLatency;
/**
* node count
@@ -85,7 +85,7 @@ public class ZookeeperRecord {
private int state;
- public ZookeeperRecord(String hostname,int connections, int watches, long sent, long received, String mode, int minLatency, int avgLatency, int maxLatency, int nodeCount, int state,Date date) {
+ public ZookeeperRecord(String hostname,int connections, int watches, long sent, long received, String mode, float minLatency, float avgLatency, float maxLatency, int nodeCount, int state,Date date) {
this.hostname = hostname;
this.connections = connections;
this.watches = watches;
@@ -149,23 +149,23 @@ public class ZookeeperRecord {
this.mode = mode;
}
- public int getMinLatency() {
+ public float getMinLatency() {
return minLatency;
}
- public void setMinLatency(int minLatency) {
+ public void setMinLatency(float minLatency) {
this.minLatency = minLatency;
}
- public int getAvgLatency() {
+ public float getAvgLatency() {
return avgLatency;
}
- public void setAvgLatency(int avgLatency) {
+ public void setAvgLatency(float avgLatency) {
this.avgLatency = avgLatency;
}
- public int getMaxLatency() {
+ public float getMaxLatency() {
return maxLatency;
}