You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ca...@apache.org on 2011/09/27 17:06:41 UTC
svn commit: r1176425 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/main/org/apache/zookeeper/ClientCnxn.java
src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
src/java/main/org/apache/zookeeper/server/DataTree.java
Author: camille
Date: Tue Sep 27 15:06:41 2011
New Revision: 1176425
URL: http://svn.apache.org/viewvc?rev=1176425&view=rev
Log:
ZOOKEEPER-1174. FD leak when network unreachable (Ted Dunning via camille)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxn.java
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1176425&r1=1176424&r2=1176425&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Tue Sep 27 15:06:41 2011
@@ -330,6 +330,8 @@ BUGFIXES:
ZOOKEEPER-1185. Send AuthFailed event to client if SASL authentication fails.
(Eugene Kuntz via mahadev)
+
+ ZOOKEEPER-1174. FD leak when network unreachable (Ted Dunning via camille)
IMPROVEMENTS:
ZOOKEEPER-724. Improve junit test integration - log harness information
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=1176425&r1=1176424&r2=1176425&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 Tue Sep 27 15:06:41 2011
@@ -1040,7 +1040,7 @@ public class ClientCnxn {
clientCnxnSocket.doTransport(to, pendingQueue, outgoingQueue);
- } catch (Exception e) {
+ } catch (Throwable e) {
if (closing) {
if (LOG.isDebugEnabled()) {
// closing so this is expected
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java?rev=1176425&r1=1176424&r2=1176425&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java Tue Sep 27 15:06:41 2011
@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ClientCnxn.EndOfStreamException;
import org.apache.zookeeper.ClientCnxn.Packet;
import org.apache.zookeeper.ZooDefs.OpCode;
-import org.apache.zookeeper.ZooKeeper.States;
public class ClientCnxnSocketNIO extends ClientCnxnSocket {
private static final Logger LOG = LoggerFactory
@@ -185,9 +184,15 @@ public class ClientCnxnSocketNIO extends
sock.configureBlocking(false);
sock.socket().setSoLinger(false, -1);
sock.socket().setTcpNoDelay(true);
- sockKey = sock.register(selector, SelectionKey.OP_CONNECT);
- if (sock.connect(addr)) {
- sendThread.primeConnection();
+ try {
+ boolean immediateConnect = sock.connect(addr);
+ sockKey = sock.register(selector, SelectionKey.OP_CONNECT);
+ if (immediateConnect) {
+ sendThread.primeConnection();
+ }
+ } catch (IOException e) {
+ LOG.error("Unable to open socket to " + addr);
+ sock.close();
}
initialized = false;
@@ -309,4 +314,8 @@ public class ClientCnxnSocketNIO extends
synchronized void enableReadWriteOnly() {
sockKey.interestOps(SelectionKey.OP_READ | SelectionKey.OP_WRITE);
}
+
+ Selector getSelector() {
+ return selector;
+ }
}
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java?rev=1176425&r1=1176424&r2=1176425&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java Tue Sep 27 15:06:41 2011
@@ -209,7 +209,7 @@ public class DataTree {
/**
* converts a list of longs to a list of acls.
*
- * @param longs
+ * @param longVal
* the list of longs
* @return a list of ACLs that map to longs
*/
@@ -630,7 +630,7 @@ public class DataTree {
/**
* If there is a quota set, return the appropriate prefix for that quota
* Else return null
- * @param The ZK path to check for quota
+ * @param path The ZK path to check for quota
* @return Max quota prefix, or null if none
*/
public String getMaxPrefixWithQuota(String path) {
@@ -971,9 +971,7 @@ public class DataTree {
*
* @param path
* the path to be used
- * @param bytes
- * the long bytes
- * @param count
+ * @param counts
* the int count
*/
private void getCounts(String path, Counts counts) {