You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/11/09 00:07:56 UTC
svn commit: r1713313 - in /zookeeper/branches/branch-3.5: CHANGES.txt
src/java/main/org/apache/zookeeper/ClientCnxn.java
Author: rgs
Date: Sun Nov 8 23:07:56 2015
New Revision: 1713313
URL: http://svn.apache.org/viewvc?rev=1713313&view=rev
Log:
ZOOKEEPER-2315: Change client connect zk service timeout log level from Info
to Warn level (Lin Yiqun via rgs)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1713313&r1=1713312&r2=1713313&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sun Nov 8 23:07:56 2015
@@ -61,6 +61,9 @@ IMPROVEMENTS:
ZOOKEEPER-2040: Server to log underlying cause of SASL connection problems.
(Steve Loughran via cnauroth)
+ ZOOKEEPER-2315: Change client connect zk service timeout log level from Info
+ to Warn level (Lin Yiqun via rgs)
+
Release 3.5.1 - 07/27/2015
NEW FEATURES:
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1713313&r1=1713312&r2=1713313&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java Sun Nov 8 23:07:56 2015
@@ -1197,11 +1197,14 @@ public class ClientCnxn {
}
if (to <= 0) {
- throw new SessionTimeoutException(
- "Client session timed out, have not heard from server in "
- + clientCnxnSocket.getIdleRecv() + "ms"
- + " for sessionid 0x"
- + Long.toHexString(sessionId));
+ String warnInfo;
+ warnInfo = "Client session timed out, have not heard from server in "
+ + clientCnxnSocket.getIdleRecv()
+ + "ms"
+ + " for sessionid 0x"
+ + Long.toHexString(sessionId);
+ LOG.warn(warnInfo);
+ throw new SessionTimeoutException(warnInfo);
}
if (state.isConnected()) {
//1000(1 second) is to prevent race condition missing to send the second ping
@@ -1382,9 +1385,12 @@ public class ClientCnxn {
Watcher.Event.EventType.None,
Watcher.Event.KeeperState.Expired, null));
eventThread.queueEventOfDeath();
- throw new SessionExpiredException(
- "Unable to reconnect to ZooKeeper service, session 0x"
- + Long.toHexString(sessionId) + " has expired");
+
+ String warnInfo;
+ warnInfo = "Unable to reconnect to ZooKeeper service, session 0x"
+ + Long.toHexString(sessionId) + " has expired";
+ LOG.warn(warnInfo);
+ throw new SessionExpiredException(warnInfo);
}
if (!readOnly && isRO) {
LOG.error("Read/write client got connected to read-only server");