Separated out the "normal" NIO selector count from the "admin service…

…" NIO selector count as the latter may tend to need to be bigger on account of the long-lived requests.
psemenyuk · Feb 12, 2010 · 3a1c02f · 3a1c02f
1 parent c499c66
commit 3a1c02f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/java/voldemort/server/VoldemortConfig.java b/src/java/voldemort/server/VoldemortConfig.java
@@ -92,6 +92,7 @@ public class VoldemortConfig implements Serializable {
 
     private boolean useNioConnector;
     private int nioConnectorSelectors;
+    private int nioAdminConnectorSelectors;
 
     private int clientRoutingTimeoutMs;
     private int clientMaxConnectionsPerNode;
@@ -230,7 +231,9 @@ public VoldemortConfig(Props props) {
 
         this.useNioConnector = props.getBoolean("enable.nio.connector", false);
         this.nioConnectorSelectors = props.getInt("nio.connector.selectors",
-                                                  Runtime.getRuntime().availableProcessors() * 4);
+                                                  Runtime.getRuntime().availableProcessors());
+        this.nioAdminConnectorSelectors = props.getInt("nio.admin.connector.selectors",
+                                                       Runtime.getRuntime().availableProcessors() * 4);
 
         this.clientMaxConnectionsPerNode = props.getInt("client.max.connections.per.node", 5);
         this.clientConnectionTimeoutMs = props.getInt("client.connection.timeout.ms", 400);
@@ -899,6 +902,14 @@ public void setNioConnectorSelectors(int nioConnectorSelectors) {
         this.nioConnectorSelectors = nioConnectorSelectors;
     }
 
+    public int getNioAdminConnectorSelectors() {
+        return nioAdminConnectorSelectors;
+    }
+
+    public void setNioAdminConnectorSelectors(int nioAdminConnectorSelectors) {
+        this.nioAdminConnectorSelectors = nioAdminConnectorSelectors;
+    }
+
     public int getAdminSocketBufferSize() {
         return adminStreamBufferSize;
     }

diff --git a/src/java/voldemort/server/VoldemortServer.java b/src/java/voldemort/server/VoldemortServer.java
@@ -178,7 +178,7 @@ private List<VoldemortService> createServices() {
                 services.add(new NioSocketService(adminRequestHandlerFactory,
                                                   identityNode.getAdminPort(),
                                                   voldemortConfig.getAdminSocketBufferSize(),
-                                                  voldemortConfig.getNioConnectorSelectors(),
+                                                  voldemortConfig.getNioAdminConnectorSelectors(),
                                                   "admin-server",
                                                   voldemortConfig.isJmxEnabled()));
             } else {