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 2013/09/18 04:06:29 UTC
svn commit: r1524274 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/main/org/apache/zookeeper/ClientCnxn.java
Author: mahadev
Date: Wed Sep 18 02:06:28 2013
New Revision: 1524274
URL: http://svn.apache.org/r1524274
Log:
ZOOKEEPER-1751. ClientCnxn#run could miss the second ping or connection get dropped before a ping. (Jeffrey Zhong via mahadev)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxn.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1524274&r1=1524273&r2=1524274&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Wed Sep 18 02:06:28 2013
@@ -99,6 +99,9 @@ BUGFIXES:
ZOOKEEPER-1754. Read-only server allows to create znode (Rakesh R via fpj)
+ ZOOKEEPER-1751. ClientCnxn#run could miss the second ping or connection get
+ dropped before a ping. (Jeffrey Zhong via mahadev)
+
IMPROVEMENTS:
ZOOKEEPER-1564. Allow JUnit test build with IBM Java
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1524274&r1=1524273&r2=1524274&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxn.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxn.java Wed Sep 18 02:06:28 2013
@@ -976,6 +976,7 @@ public class ClientCnxn {
clientCnxnSocket.updateLastSendAndHeard();
int to;
long lastPingRwServer = System.currentTimeMillis();
+ final int MAX_SEND_PING_INTERVAL = 10000; //10 seconds
while (state.isAlive()) {
try {
if (!clientCnxnSocket.isConnected()) {
@@ -1039,9 +1040,12 @@ public class ClientCnxn {
+ Long.toHexString(sessionId));
}
if (state.isConnected()) {
- int timeToNextPing = readTimeout / 2
- - clientCnxnSocket.getIdleSend();
- if (timeToNextPing <= 0) {
+ //1000(1 second) is to prevent race condition missing to send the second ping
+ //also make sure not to send too many pings when readTimeout is small
+ int timeToNextPing = readTimeout / 2 - clientCnxnSocket.getIdleSend() -
+ ((clientCnxnSocket.getIdleSend() > 1000) ? 1000 : 0);
+ //send a ping request either time is due or no packet sent out within MAX_SEND_PING_INTERVAL
+ if (timeToNextPing <= 0 || clientCnxnSocket.getIdleSend() > MAX_SEND_PING_INTERVAL) {
sendPing();
clientCnxnSocket.updateLastSend();
} else {