More feedback from Jetty

Use a QTP with the defaults and call setName() instead Uses a unique name per pool so you can identify the various pools/servers
jenkinsci · Jan 20, 2020 · 5bdfd1e · 5bdfd1e
1 parent 830184e
commit 5bdfd1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -133,6 +133,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.security.Password;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.webapp.WebXmlConfiguration;
@@ -504,7 +505,9 @@ public void setPluginManager(PluginManager pluginManager) {
      * that we need for testing.
      */
     protected ServletContext createWebServer() throws Exception {
-        server = new Server();
+        QueuedThreadPool qtp = new QueuedThreadPool();
+        qtp.setName("Jetty Thread Pool (HudsonTestCase)");
+        server = new Server(qtp);
 
         explodedWarDir = WarExploder.getExplodedDir();
         WebAppContext context = new WebAppContext(explodedWarDir.getPath(), contextPath);

diff --git a/src/main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java b/src/main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java
@@ -8,7 +8,7 @@
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
-
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -34,8 +34,9 @@ public class JavaNetReverseProxy extends HttpServlet {
     public JavaNetReverseProxy(File cacheFolder) throws Exception {
         this.cacheFolder = cacheFolder;
         cacheFolder.mkdirs();
-
-        server = new Server();
+        QueuedThreadPool qtp = new QueuedThreadPool();
+        qtp.setName("Jetty Thread Pool (JavaNetReverseProxy)");
+        server = new Server(qtp);
 
         ContextHandlerCollection contexts = new ContextHandlerCollection();
         server.setHandler(contexts);

diff --git a/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -197,6 +197,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.security.Password;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.webapp.WebXmlConfiguration;
@@ -733,7 +734,9 @@ public static ImmutablePair<Server, ServletContext> _createWebServer(String cont
                                                                          ClassLoader classLoader, int localPort,
                                                                          Supplier<LoginService> loginServiceSupplier)
             throws Exception {
-        Server server = new Server();
+        QueuedThreadPool qtp = new QueuedThreadPool();
+        qtp.setName("Jetty Thread Pool (JenkinsRule)");
+        Server server = new Server(qtp);
 
         WebAppContext context = new WebAppContext(WarExploder.getExplodedDir().getPath(), contextPath);
         context.setClassLoader(classLoader);