Fix #6772 adding a configuration parameter to set the number of thread jetty uses.

Default = -1 = current behavior ( 255 thread from Jetty's default settings )

Author: freynaud

java/server/src/org/openqa/grid/common/defaults/DefaultHub.json

@@ -11,5 +11,6 @@
   "cleanUpCycle": 5000,
   "timeout": 300000,
   "browserTimeout": 0,
-  "maxSession": 5
+  "maxSession": 5,
+  "jettyMaxThreads":-1
 }

java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java

@@ -99,6 +99,10 @@ public class GridHubConfiguration {
    */
   private String logFilename;
 
+  /**
+   * max number of thread for Jetty. Default is normally 255.
+   */
+  private int jettyMaxThreads = -1;
   /**
    * to specify that logging level should be set to Level.DEBUG
    */
@@ -113,6 +117,7 @@ public class GridHubConfiguration {
   private String grid1Yml = null;
   private String grid2JSON = null;
 
+
   public GridHubConfiguration() {
     loadDefault();
   }
@@ -180,6 +185,9 @@ public void loadFromCommandLine(String[] args) {
     if (helper.isParamPresent("-port")) {
       port = Integer.parseInt(helper.getParamValue("-port"));
     }
+    if (helper.isParamPresent("-jettyMaxThreads")) {
+      jettyMaxThreads = Integer.parseInt(helper.getParamValue("-jettyMaxThreads"));
+    }
     if (helper.isParamPresent("-cleanUpCycle")) {
       cleanupCycle = Integer.parseInt(helper.getParamValue("-cleanUpCycle"));
     }
@@ -306,6 +314,9 @@ public void loadFromJSON(String resource) {
           servlets.add(jsservlets.getString(i));
         }
       }
+      if (o.has("jettyMaxThreads") && !o.isNull("jettyMaxThreads")) {
+        jettyMaxThreads = o.getInt("jettyMaxThreads");
+      }
       if (o.has("prioritizer") && !o.isNull("prioritizer")) {
         String prioritizerClass = o.getString("prioritizer");
         setPrioritizer(prioritizerClass);
@@ -516,4 +527,7 @@ public Map<String, Object> getAllParams() {
     return allParams;
   }
 
+  public int getJettyMaxThreads() {
+    return jettyMaxThreads;
+  }
 }

java/server/src/org/openqa/grid/web/Hub.java

@@ -36,6 +36,7 @@
 import org.seleniumhq.jetty7.server.Server;
 import org.seleniumhq.jetty7.server.bio.SocketConnector;
 import org.seleniumhq.jetty7.servlet.ServletContextHandler;
+import org.seleniumhq.jetty7.util.thread.QueuedThreadPool;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -54,6 +55,7 @@ public class Hub {
 
   private final int port;
   private final String host;
+  private final int maxThread;
   private final boolean isHostRestricted;
   private final Registry registry;
   private final Map<String, Class<? extends Servlet>> extraServlet = Maps.newHashMap();
@@ -76,6 +78,8 @@ public Registry getRegistry() {
   public Hub(GridHubConfiguration config) {
     registry = Registry.newInstance(this, config);
 
+    maxThread = config.getJettyMaxThreads();
+
     if (config.getHost() != null) {
       host = config.getHost();
       isHostRestricted = true;
@@ -161,6 +165,11 @@ public String getHost() {
   public void start() throws Exception {
     initServer();
     server.start();
+    if (maxThread>0){
+      QueuedThreadPool pool = new QueuedThreadPool();
+      pool.setMaxThreads(maxThread);
+      server.setThreadPool(pool);
+    }
   }
 
   public void stop() throws Exception {