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
The following commit(s) were added to refs/heads/master by this push: new e95f5a6 DRILL-7650: Add option to enable Jetty's dump for troubleshooting e95f5a6 is described below commit e95f5a6a403d76b58f33944927d9d707505cc7ea Author: Igor Guzenko <ihor.huzenko....@gmail.com> AuthorDate: Thu Mar 19 13:13:56 2020 +0200 DRILL-7650: Add option to enable Jetty's dump for troubleshooting 1. Added option drill.exec.http.jetty.server.dumpAfterStart 2. Removed redundant setProtocol() call --- distribution/src/main/resources/drill-override-example.conf | 2 ++ exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java | 1 + .../src/main/java/org/apache/drill/exec/server/rest/WebServer.java | 1 + .../drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java | 1 - exec/java-exec/src/main/resources/drill-module.conf | 3 ++- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/resources/drill-override-example.conf b/distribution/src/main/resources/drill-override-example.conf index 499e371..6fcca37 100644 --- a/distribution/src/main/resources/drill-override-example.conf +++ b/distribution/src/main/resources/drill-override-example.conf @@ -115,6 +115,8 @@ drill.exec: { }, jetty: { server: { + # development option which allows to log Jetty server state after start + dumpAfterStart: false, # Optional params to set on Jetty's org.eclipse.jetty.util.ssl.SslContextFactory when drill.exec.http.ssl_enabled sslContextFactory: { # allows to specify cert to use when multiple non-SNI certificates are available. 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 3db3bba..c421c73 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 @@ -210,6 +210,7 @@ public final class ExecConstants { public static final String HTTP_PROFILES_PER_PAGE = "drill.exec.http.profiles_per_page"; public static final String HTTP_PORT = "drill.exec.http.port"; public static final String HTTP_PORT_HUNT = "drill.exec.http.porthunt"; + public static final String HTTP_JETTY_SERVER_DUMP_AFTER_START = "drill.exec.http.jetty.server.dumpAfterStart"; 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"; 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 7a6c2aa..17d97d7 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 @@ -162,6 +162,7 @@ public class WebServer implements AutoCloseable { threadPool.setMaxThreads(handlers + connector.getAcceptors() + connector.getSelectorManager().getSelectorCount()); embeddedJetty.addConnector(connector); + embeddedJetty.setDumpAfterStart(config.getBoolean(ExecConstants.HTTP_JETTY_SERVER_DUMP_AFTER_START)); final boolean portHunt = config.getBoolean(ExecConstants.HTTP_PORT_HUNT); for (int retry = 0; retry < PORT_HUNT_TRIES; retry++) { connector.setPort(port); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java index 62a740b..7da5465 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java @@ -93,7 +93,6 @@ public class SslContextFactoryConfigurator { sslFactory.setTrustStorePassword(sslConf.getTrustStorePassword()); } } - sslFactory.setProtocol(sslConf.getProtocol()); sslFactory.setIncludeProtocols(sslConf.getProtocol()); logger.info("Web server configured to use TLS protocol '{}'", sslConf.getProtocol()); if (config.hasPath(ExecConstants.HTTP_JETTY_SSL_CONTEXT_FACTORY_OPTIONS_PREFIX)) { diff --git a/exec/java-exec/src/main/resources/drill-module.conf b/exec/java-exec/src/main/resources/drill-module.conf index 03194c5..9e306e6 100644 --- a/exec/java-exec/src/main/resources/drill-module.conf +++ b/exec/java-exec/src/main/resources/drill-module.conf @@ -157,7 +157,8 @@ drill.exec: { server : { acceptors : 1, selectors : 1, - handlers : 5 + handlers : 5, + dumpAfterStart: false } } max_profiles: 100,