ZOOKEEPER-1030: Increase default for maxClientCnxns (Todd Lipcon via breed/mahadev/phunt)

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

CHANGES.txt

@@ -258,9 +258,14 @@ IMPROVEMENTS:
 
   ZOOKEEPER-465. Ledger size in bytes. (flavio via mahadev)
 
-  ZOOKEEPER-980. allow configuration parameters for log4j.properties (phunt via mahadev)
+  ZOOKEEPER-980. allow configuration parameters for log4j.properties
+  (phunt via mahadev)
+
+  ZOOKEEPER-1042. Generate zookeeper test jar for maven installation
+  (ivan kelly via breed)
 
-  ZOOKEEPER-ZOOKEEPER-1042. Generate zookeeper test jar for maven installation (ivan kelly via breed)
+  ZOOKEEPER-1030: Increase default for maxClientCnxns
+  (Todd Lipcon via breed/mahadev/phunt)
 
 NEW FEATURES:
   ZOOKEEPER-729. Java client API to recursively delete a subtree.

docs/zookeeperAdmin.html

@@ -1102,7 +1102,7 @@ server.3=zoo3:2888:3888</pre>
               level) that a single client, identified by IP address, may make
               to a single member of the ZooKeeper ensemble. This is used to 
               prevent certain classes of DoS attacks, including file 
-              descriptor exhaustion. The default is 10. Setting this to 0 
+              descriptor exhaustion. The default is 60. Setting this to 0 
               entirely removes the limit on concurrent connections.</p>
 </dd>
 

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

@@ -70,7 +70,7 @@ public class NIOServerCnxnFactory extends ServerCnxnFactory implements Runnable
     final HashMap<InetAddress, Set<NIOServerCnxn>> ipMap =
         new HashMap<InetAddress, Set<NIOServerCnxn>>( );
 
-    int maxClientCnxns = 10;
+    int maxClientCnxns = 60;
 
 
     /**
@@ -303,4 +303,4 @@ public class NIOServerCnxnFactory extends ServerCnxnFactory implements Runnable
         return cnxns;
     }
 
-}
+}

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

@@ -54,7 +54,7 @@ public class NettyServerCnxnFactory extends ServerCnxnFactory {
     HashMap<InetAddress, Set<NettyServerCnxn>> ipMap =
         new HashMap<InetAddress, Set<NettyServerCnxn>>( );
     InetSocketAddress localAddress;
-    int maxClientCnxns = 10;
+    int maxClientCnxns = 60;
     
     /**
      * This is an inner class since we need to extend SimpleChannelHandler, but

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java

@@ -48,7 +48,7 @@ public class QuorumPeerConfig {
     protected String dataDir;
     protected String dataLogDir;
     protected int tickTime = ZooKeeperServer.DEFAULT_TICK_TIME;
-    protected int maxClientCnxns = 10;
+    protected int maxClientCnxns = 60;
     /** defaults to -1 if not set explicitly */
     protected int minSessionTimeout = -1;
     /** defaults to -1 if not set explicitly */