ZOOKEEPER-1049. Session expire/close flooding renders heartbeats to delay significantly. (chang song via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1099267 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -203,6 +203,9 @@ BUGFIXES:
 
   ZOOKEEPER-975. new peer goes in LEADING state even if ensemble is online. (vishal via fpj)
 
+  ZOOKEEPER-1049. Session expire/close flooding renders heartbeats to delay significantly. 
+  (chang song via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -102,7 +102,9 @@ public class NIOServerCnxn extends ServerCnxn {
             outstandingLimit = zk.getGlobalOutstandingLimit();
         }
         sock.socket().setTcpNoDelay(true);
-        sock.socket().setSoLinger(true, 2);
+        /* set socket linger to false, so that socket close does not
+         * block */
+        sock.socket().setSoLinger(false, -1);
         InetAddress addr = ((InetSocketAddress) sock.socket()
                 .getRemoteSocketAddress()).getAddress();
         authInfo.add(new Id("ip", addr.getHostAddress()));