diff --git contrib/pom.xml contrib/pom.xml index ee2013fdbd..06578cf022 100644 --- contrib/pom.xml +++ contrib/pom.xml @@ -60,6 +60,12 @@ hadoop-common ${hadoop.version} true + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git druid-handler/pom.xml druid-handler/pom.xml index 7d5c3f4ea1..c1c55bd84c 100644 --- druid-handler/pom.xml +++ druid-handler/pom.xml @@ -106,6 +106,10 @@ org.apache.druid druid-aws-common + + org.eclipse.jetty + * + true @@ -196,6 +200,10 @@ com.fasterxml.jackson.core jackson-databind + + org.eclipse.jetty + * + diff --git hbase-handler/pom.xml hbase-handler/pom.xml index da24059f32..d02b14fab2 100644 --- hbase-handler/pom.xml +++ hbase-handler/pom.xml @@ -93,6 +93,10 @@ org.glassfish.web javax.servlet.jsp + + org.eclipse.jetty + * + @@ -132,7 +136,7 @@ org.eclipse.jetty - jetty-util + * @@ -221,6 +225,10 @@ commons-logging commons-logging + + org.eclipse.jetty + * + diff --git hcatalog/hcatalog-pig-adapter/pom.xml hcatalog/hcatalog-pig-adapter/pom.xml index bc8bfba646..b91b840899 100644 --- hcatalog/hcatalog-pig-adapter/pom.xml +++ hcatalog/hcatalog-pig-adapter/pom.xml @@ -50,6 +50,12 @@ org.apache.hadoop hadoop-common ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop @@ -82,6 +88,12 @@ hadoop-hdfs ${hadoop.version} test + + + org.eclipse.jetty + * + + diff --git hcatalog/streaming/pom.xml hcatalog/streaming/pom.xml index ae451c48f3..270ab1b6df 100644 --- hcatalog/streaming/pom.xml +++ hcatalog/streaming/pom.xml @@ -72,6 +72,12 @@ hadoop-common true ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git hcatalog/webhcat/java-client/pom.xml hcatalog/webhcat/java-client/pom.xml index 66ebfb5375..ba5e7d3ed0 100644 --- hcatalog/webhcat/java-client/pom.xml +++ hcatalog/webhcat/java-client/pom.xml @@ -60,6 +60,12 @@ org.apache.hadoop hadoop-common ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git hplsql/pom.xml hplsql/pom.xml index 2642c6a3ea..3ad1804b11 100644 --- hplsql/pom.xml +++ hplsql/pom.xml @@ -63,6 +63,12 @@ hadoop-common ${hadoop.version} true + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git kafka-handler/pom.xml kafka-handler/pom.xml index 6ad41deb99..0a9d9ffaa4 100644 --- kafka-handler/pom.xml +++ kafka-handler/pom.xml @@ -60,9 +60,13 @@ hadoop-common - org.slf4j - slf4j-api - + org.slf4j + slf4j-api + + + org.eclipse.jetty + * + diff --git kudu-handler/pom.xml kudu-handler/pom.xml index c4661fac47..e3b929156a 100644 --- kudu-handler/pom.xml +++ kudu-handler/pom.xml @@ -54,6 +54,12 @@ ${hadoop.version} provided true + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git llap-ext-client/pom.xml llap-ext-client/pom.xml index cfc3468342..aaa62a179d 100644 --- llap-ext-client/pom.xml +++ llap-ext-client/pom.xml @@ -65,6 +65,10 @@ commons-logging commons-logging + + org.eclipse.jetty + * + @@ -140,6 +144,10 @@ commons-logging commons-logging + + org.eclipse.jetty + * + diff --git pom.xml pom.xml index ee7ca0af6e..0bf1a30d3a 100644 --- pom.xml +++ pom.xml @@ -174,7 +174,7 @@ 2.3.1 5.5.1 1.1 - 9.3.27.v20190418 + 9.4.26.v20200117 1.19 2.22.2 @@ -811,12 +811,22 @@ org.apache.curator curator-recipes + + org.eclipse.jetty + * + org.apache.hadoop hadoop-hdfs ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop @@ -901,6 +911,12 @@ org.apache.hadoop hadoop-yarn-server-web-proxy ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hbase diff --git service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java index c81888aff5..8f495df0bc 100644 --- service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java +++ service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java @@ -19,7 +19,6 @@ package org.apache.hive.service.cli.thrift; import java.util.Arrays; -import java.util.concurrent.ExecutorService; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -78,11 +77,10 @@ protected void initServer() { // Start with minWorkerThreads, expand till maxWorkerThreads and reject // subsequent requests String threadPoolName = "HiveServer2-HttpHandler-Pool"; - ExecutorService executorService = new ThreadPoolExecutorWithOomHook(minWorkerThreads, + ThreadPoolExecutor threadPoolExecutorWithOomHook = new ThreadPoolExecutorWithOomHook(minWorkerThreads, maxWorkerThreads,workerKeepAliveTime, TimeUnit.SECONDS, new SynchronousQueue(), new ThreadFactoryWithGarbageCleanup(threadPoolName), oomHook); - - ExecutorThreadPool threadPool = new ExecutorThreadPool((ThreadPoolExecutor) executorService); + ExecutorThreadPool threadPool = new ExecutorThreadPool(threadPoolExecutorWithOomHook); // HTTP Server server = new Server(threadPool); diff --git shims/0.23/pom.xml shims/0.23/pom.xml index a5d680e5df..f5f33912b9 100644 --- shims/0.23/pom.xml +++ shims/0.23/pom.xml @@ -46,16 +46,20 @@ hadoop-common ${hadoop.version} true - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging - - + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + org.eclipse.jetty + * + + org.apache.hadoop @@ -68,6 +72,12 @@ hadoop-hdfs ${hadoop.version} true + + + org.eclipse.jetty + * + + org.apache.hadoop @@ -75,6 +85,12 @@ ${hadoop.version} test-jar true + + + org.eclipse.jetty + * + + org.apache.hadoop @@ -184,6 +200,10 @@ org.slf4j slf4j-log4j12 + + org.eclipse.jetty + * + diff --git shims/scheduler/pom.xml shims/scheduler/pom.xml index 48b20970ef..68102bda29 100644 --- shims/scheduler/pom.xml +++ shims/scheduler/pom.xml @@ -46,6 +46,12 @@ hadoop-common ${hadoop.version} true + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git standalone-metastore/metastore-common/pom.xml standalone-metastore/metastore-common/pom.xml index 81dc6b6451..681f759834 100644 --- standalone-metastore/metastore-common/pom.xml +++ standalone-metastore/metastore-common/pom.xml @@ -121,6 +121,10 @@ org.apache.curator curator-framework + + org.eclipse.jetty + * + @@ -141,6 +145,10 @@ commons-logging commons-logging + + org.eclipse.jetty + * + diff --git standalone-metastore/metastore-server/pom.xml standalone-metastore/metastore-server/pom.xml index f81d39d6c8..fc9af6463d 100644 --- standalone-metastore/metastore-server/pom.xml +++ standalone-metastore/metastore-server/pom.xml @@ -123,6 +123,10 @@ org.apache.curator curator-framework + + org.eclipse.jetty + * + @@ -143,6 +147,10 @@ commons-logging commons-logging + + org.eclipse.jetty + * + diff --git standalone-metastore/pom.xml standalone-metastore/pom.xml index 01487dbfcd..93e05220cd 100644 --- standalone-metastore/pom.xml +++ standalone-metastore/pom.xml @@ -218,6 +218,10 @@ org.apache.curator curator-recipes + + org.eclipse.jetty + * + diff --git storage-api/pom.xml storage-api/pom.xml index 39b23b0af8..e7f7b01330 100644 --- storage-api/pom.xml +++ storage-api/pom.xml @@ -99,6 +99,10 @@ org.apache.curator curator-recipes + + org.eclipse.jetty + * + diff --git streaming/pom.xml streaming/pom.xml index 22fe61995d..83c088b77f 100644 --- streaming/pom.xml +++ streaming/pom.xml @@ -60,6 +60,12 @@ hadoop-common true ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop