This is an automated email from the ASF dual-hosted git repository. arina pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 260a164f1884f99208811ec151078fa019534243 Author: Vlad Rozov <[email protected]> AuthorDate: Wed Aug 22 18:42:11 2018 -0700 DRILL-6693: When a query is started from Drill Web Console, the UI becomes inaccessible until the query finishes git closes #1440 --- .../java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java | 1 + .../src/main/java/org/apache/drill/exec/server/rest/WebServer.java | 5 +++-- exec/java-exec/src/main/resources/drill-module.conf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java index 43ee886..3817971 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java @@ -182,6 +182,7 @@ public final class ExecConstants { public static final String HTTP_PORT_HUNT = "drill.exec.http.porthunt"; public static final String HTTP_JETTY_SERVER_ACCEPTORS = "drill.exec.http.jetty.server.acceptors"; public static final String HTTP_JETTY_SERVER_SELECTORS = "drill.exec.http.jetty.server.selectors"; + public static final String HTTP_JETTY_SERVER_HANDLERS = "drill.exec.http.jetty.server.handlers"; public static final String HTTP_ENABLE_SSL = "drill.exec.http.ssl_enabled"; public static final String HTTP_CORS_ENABLED = "drill.exec.http.cors.enabled"; public static final String HTTP_CORS_ALLOWED_ORIGINS = "drill.exec.http.cors.allowedOrigins"; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java index 098845e..8f88e21 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java @@ -136,7 +136,8 @@ public class WebServer implements AutoCloseable { final boolean portHunt = config.getBoolean(ExecConstants.HTTP_PORT_HUNT); final int acceptors = config.getInt(ExecConstants.HTTP_JETTY_SERVER_ACCEPTORS); final int selectors = config.getInt(ExecConstants.HTTP_JETTY_SERVER_SELECTORS); - final QueuedThreadPool threadPool = new QueuedThreadPool(2, 2, 60000); + final int handlers = config.getInt(ExecConstants.HTTP_JETTY_SERVER_HANDLERS); + final QueuedThreadPool threadPool = new QueuedThreadPool(2, 2); embeddedJetty = new Server(threadPool); ServletContextHandler webServerContext = createServletContextHandler(authEnabled); //Allow for Other Drillbits to make REST calls @@ -147,7 +148,7 @@ public class WebServer implements AutoCloseable { embeddedJetty.setHandler(webServerContext); ServerConnector connector = createConnector(port, acceptors, selectors); - threadPool.setMaxThreads(1 + connector.getAcceptors() + connector.getSelectorManager().getSelectorCount()); + threadPool.setMaxThreads(handlers + connector.getAcceptors() + connector.getSelectorManager().getSelectorCount()); embeddedJetty.addConnector(connector); for (int retry = 0; retry < PORT_HUNT_TRIES; retry++) { connector.setPort(port); diff --git a/exec/java-exec/src/main/resources/drill-module.conf b/exec/java-exec/src/main/resources/drill-module.conf index eca59b9..d4cda92 100644 --- a/exec/java-exec/src/main/resources/drill-module.conf +++ b/exec/java-exec/src/main/resources/drill-module.conf @@ -133,7 +133,8 @@ drill.exec: { jetty : { server : { acceptors : 1, - selectors : 2 + selectors : 1, + handlers : 5 } } max_profiles: 100,
