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/28 22:17:16 UTC
svn commit: r1177042 - in /zookeeper/trunk: 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: Wed Sep 28 20:17:16 2011
New Revision: 1177042
URL: http://svn.apache.org/viewvc?rev=1177042&view=rev
Log:
ZOOKEEPER-1174. FD leak when network unreachable (Ted Dunning via camille)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1177042&r1=1177041&r2=1177042&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Sep 28 20:17:16 2011
@@ -17,6 +17,8 @@ BUGFIXES:
ZOOKEEPER-1203. Zookeeper systest is missing Junit Classes
(Prashant Gokhale via phunt)
+
+ ZOOKEEPER-1174. FD leak when network unreachable (Ted Dunning via camille)
IMPROVEMENTS:
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1177042&r1=1177041&r2=1177042&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java Wed Sep 28 20:17:16 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/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java?rev=1177042&r1=1177041&r2=1177042&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java Wed Sep 28 20:17:16 2011
@@ -189,9 +189,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 {
+ sockKey = sock.register(selector, SelectionKey.OP_CONNECT);
+ boolean immediateConnect = sock.connect(addr);
+ if (immediateConnect) {
+ sendThread.primeConnection();
+ }
+ } catch (IOException e) {
+ LOG.error("Unable to open socket to " + addr);
+ sock.close();
}
initialized = false;
@@ -304,4 +310,8 @@ public class ClientCnxnSocketNIO extends
synchronized void enableReadWriteOnly() {
sockKey.interestOps(SelectionKey.OP_READ | SelectionKey.OP_WRITE);
}
+
+ Selector getSelector() {
+ return selector;
+ }
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java?rev=1177042&r1=1177041&r2=1177042&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java Wed Sep 28 20:17:16 2011
@@ -183,7 +183,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
*/
@@ -594,7 +594,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) {
@@ -933,9 +933,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) {