Repository: hbase Updated Branches: refs/heads/branch-2 e2ce252b5 -> 8c84793d2
HBASE-18224 Upgrade Jetty Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8c84793d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c84793d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c84793d Branch: refs/heads/branch-2 Commit: 8c84793d2214239a3e49b4582df1c2869ef32378 Parents: e2ce252 Author: Michael Stack <st...@apache.org> Authored: Tue Aug 22 13:33:08 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Wed Aug 23 23:14:13 2017 -0700 ---------------------------------------------------------------------- hbase-common/src/main/resources/hbase-default.xml | 2 +- .../apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java | 4 ++-- .../test/java/org/apache/hadoop/hbase/http/TestHttpServer.java | 5 +++-- .../java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java | 4 ++-- .../org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java | 4 ++-- pom.xml | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index d7944f6..01c4c58 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1602,7 +1602,7 @@ possible configurations would overwhelm and obscure the important. </property> <property> <name>hbase.http.max.threads</name> - <value>10</value> + <value>16</value> <description> The maximum number of threads that the HTTP Server will create in its ThreadPool. http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java index 680a902..185df41 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java @@ -97,12 +97,12 @@ public class FavoredNodeLoadBalancer extends BaseLoadBalancer implements Favored LOG.warn("Not running balancer since exception was thrown " + ie); return plans; } - Map<ServerName, ServerName> serverNameToServerNameWithoutCode = new HashMap<>(); + // This is not used? Findbugs says so: Map<ServerName, ServerName> serverNameToServerNameWithoutCode = new HashMap<>(); Map<ServerName, ServerName> serverNameWithoutCodeToServerName = new HashMap<>(); ServerManager serverMgr = super.services.getServerManager(); for (ServerName sn: serverMgr.getOnlineServersList()) { ServerName s = ServerName.valueOf(sn.getHostname(), sn.getPort(), ServerName.NON_STARTCODE); - serverNameToServerNameWithoutCode.put(sn, s); + // FindBugs complains about useless store! serverNameToServerNameWithoutCode.put(sn, s); serverNameWithoutCodeToServerName.put(s, sn); } for (Map.Entry<ServerName, List<HRegionInfo>> entry : clusterState.entrySet()) { http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java index 31b5b8d..e9a56ff 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java @@ -74,7 +74,8 @@ public class TestHttpServer extends HttpServerFunctionalTest { private static final Log LOG = LogFactory.getLog(TestHttpServer.class); private static HttpServer server; private static URL baseUrl; - private static final int MAX_THREADS = 10; + // jetty 9.4.x needs this many threads to start, even in the small. + static final int MAX_THREADS = 16; @SuppressWarnings("serial") public static class EchoMapServlet extends HttpServlet { @@ -150,7 +151,7 @@ public class TestHttpServer extends HttpServerFunctionalTest { @BeforeClass public static void setup() throws Exception { Configuration conf = new Configuration(); - conf.setInt(HttpServer.HTTP_MAX_THREADS, 10); + conf.setInt(HttpServer.HTTP_MAX_THREADS, MAX_THREADS); server = createTestServer(conf); server.addServlet("echo", "/echo", EchoServlet.class); server.addServlet("echomap", "/echomap", EchoMapServlet.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java index 44d122a..b599350 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java @@ -62,7 +62,7 @@ public class TestSSLHttpServer extends HttpServerFunctionalTest { @BeforeClass public static void setup() throws Exception { conf = new Configuration(); - conf.setInt(HttpServer.HTTP_MAX_THREADS, 10); + conf.setInt(HttpServer.HTTP_MAX_THREADS, TestHttpServer.MAX_THREADS); File base = new File(BASEDIR); FileUtil.fullyDelete(base); http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java index a84895f..4fad031 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java @@ -168,7 +168,7 @@ public class TestSpnegoHttpServer extends HttpServerFunctionalTest { Configuration conf = new Configuration(); KerberosName.setRules("DEFAULT"); - conf.setInt(HttpServer.HTTP_MAX_THREADS, 10); + conf.setInt(HttpServer.HTTP_MAX_THREADS, TestHttpServer.MAX_THREADS); // Enable Kerberos (pre-req) conf.set("hbase.security.authentication", "kerberos"); @@ -245,7 +245,7 @@ public class TestSpnegoHttpServer extends HttpServerFunctionalTest { @Test(expected = IllegalArgumentException.class) public void testMissingConfigurationThrowsException() throws Exception { Configuration conf = new Configuration(); - conf.setInt(HttpServer.HTTP_MAX_THREADS, 10); + conf.setInt(HttpServer.HTTP_MAX_THREADS, TestHttpServer.MAX_THREADS); // Enable Kerberos (pre-req) conf.set("hbase.security.authentication", "kerberos"); // Intentionally skip keytab and principal http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java index 70cb66a..74c7690 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java @@ -112,12 +112,12 @@ public class TestThriftHttpServer { try { runThriftServer(1024 * 63); } catch (TTransportException tex) { - assertFalse(tex.getMessage().equals("HTTP Response code: 413")); + assertFalse(tex.getMessage().equals("HTTP Response code: 431")); } // Test thrift server with HTTP header length more than 64k, expect an exception exception.expect(TTransportException.class); - exception.expectMessage("HTTP Response code: 413"); + exception.expectMessage("HTTP Response code: 431"); runThriftServer(1024 * 64); } http://git-wip-us.apache.org/repos/asf/hbase/blob/8c84793d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0ac0f27..be0be99 100644 --- a/pom.xml +++ b/pom.xml @@ -1354,7 +1354,7 @@ <metrics-core.version>3.2.1</metrics-core.version> <jackson.version>2.23.2</jackson.version> <jaxb-api.version>2.2.12</jaxb-api.version> - <jetty.version>9.3.8.v20160314</jetty.version> + <jetty.version>9.4.6.v20170531</jetty.version> <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version> <servlet.api.version>3.1.0</servlet.api.version> <wx.rs.api.version>2.0.1</wx.rs.api.version>
