You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2021/01/30 08:13:36 UTC
[zookeeper] branch master updated: ZOOKEEPER-3849: improve the all
logs with a necessary time unit at the start up of server
This is an automated email from the ASF dual-hosted git repository.
maoling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new c481d3c ZOOKEEPER-3849: improve the all logs with a necessary time unit at the start up of server
c481d3c is described below
commit c481d3ced22ac69dc8549a4244f7dc10c2623155
Author: ZWShuai91 <17...@163.com>
AuthorDate: Sat Jan 30 16:13:26 2021 +0800
ZOOKEEPER-3849: improve the all logs with a necessary time unit at the start up of server
improve the all logs with a necessary time unit at the start up of server , add ms in log
Author: ZWShuai91 <17...@163.com>
Reviewers: Mate Szalay-Beko <sy...@apache.org>, HorizonNet, maoling <ma...@sina.com>
Closes #1371 from ZWShuai91/ZOOKEEPER-3849
---
.../org/apache/zookeeper/server/RequestThrottler.java | 2 +-
.../org/apache/zookeeper/server/ZooKeeperServer.java | 18 +++++++++---------
.../zookeeper/server/quorum/FastLeaderElection.java | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
index 32863d9..8692363 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
@@ -72,7 +72,7 @@ public class RequestThrottler extends ZooKeeperCriticalThread {
static {
shutdownTimeout = Integer.getInteger(SHUTDOWN_TIMEOUT, 10000);
- LOG.info("{} = {}", SHUTDOWN_TIMEOUT, shutdownTimeout);
+ LOG.info("{} = {} ms", SHUTDOWN_TIMEOUT, shutdownTimeout);
}
/**
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
index d48a7bf..3ffbb4b 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -360,9 +360,9 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
LOG.info(
"Created server with"
- + " tickTime {}"
- + " minSessionTimeout {}"
- + " maxSessionTimeout {}"
+ + " tickTime {} ms"
+ + " minSessionTimeout {} ms"
+ + " maxSessionTimeout {} ms"
+ " clientPortListenBacklog {}"
+ " datadir {}"
+ " snapdir {}",
@@ -1274,7 +1274,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
}
public void setTickTime(int tickTime) {
- LOG.info("tickTime set to {}", tickTime);
+ LOG.info("tickTime set to {} ms", tickTime);
this.tickTime = tickTime;
}
@@ -1283,7 +1283,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
}
public static void setThrottledOpWaitTime(int time) {
- LOG.info("throttledOpWaitTime set to {}", time);
+ LOG.info("throttledOpWaitTime set to {} ms", time);
throttledOpWaitTime = time;
}
@@ -1293,7 +1293,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
public void setMinSessionTimeout(int min) {
this.minSessionTimeout = min == -1 ? tickTime * 2 : min;
- LOG.info("minSessionTimeout set to {}", this.minSessionTimeout);
+ LOG.info("minSessionTimeout set to {} ms", this.minSessionTimeout);
}
public int getMaxSessionTimeout() {
@@ -1302,7 +1302,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
public void setMaxSessionTimeout(int max) {
this.maxSessionTimeout = max == -1 ? tickTime * 20 : max;
- LOG.info("maxSessionTimeout set to {}", this.maxSessionTimeout);
+ LOG.info("maxSessionTimeout set to {} ms", this.maxSessionTimeout);
}
public int getClientPortListenBacklog() {
@@ -1492,7 +1492,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
}
static void setFlushDelay(long delay) {
- LOG.info("{}={}", FLUSH_DELAY, delay);
+ LOG.info("{} = {} ms", FLUSH_DELAY, delay);
flushDelay = delay;
}
@@ -1501,7 +1501,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
}
static void setMaxWriteQueuePollTime(long maxTime) {
- LOG.info("{}={}", MAX_WRITE_QUEUE_POLL_SIZE, maxTime);
+ LOG.info("{} = {} ms", MAX_WRITE_QUEUE_POLL_SIZE, maxTime);
maxWriteQueuePollTime = maxTime;
}
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
index f141e85..0950c6d 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
@@ -86,9 +86,9 @@ public class FastLeaderElection implements Election {
static {
minNotificationInterval = Integer.getInteger(MIN_NOTIFICATION_INTERVAL, minNotificationInterval);
- LOG.info("{}={}", MIN_NOTIFICATION_INTERVAL, minNotificationInterval);
+ LOG.info("{} = {} ms", MIN_NOTIFICATION_INTERVAL, minNotificationInterval);
maxNotificationInterval = Integer.getInteger(MAX_NOTIFICATION_INTERVAL, maxNotificationInterval);
- LOG.info("{}={}", MAX_NOTIFICATION_INTERVAL, maxNotificationInterval);
+ LOG.info("{} = {} ms", MAX_NOTIFICATION_INTERVAL, maxNotificationInterval);
}
/**
@@ -977,7 +977,7 @@ public class FastLeaderElection implements Election {
*/
int tmpTimeOut = notTimeout * 2;
notTimeout = Math.min(tmpTimeOut, maxNotificationInterval);
- LOG.info("Notification time out: {}", notTimeout);
+ LOG.info("Notification time out: {} ms", notTimeout);
} else if (validVoter(n.sid) && validVoter(n.leader)) {
/*
* Only proceed if the vote comes from a replica in the current or next