hbase git commit: HBASE-18224 Upgrade Jetty

2017-08-24 Thread stack 
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 
Authored: Tue Aug 22 13:33:08 2017 -0700
Committer: Michael Stack 
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.
   
   
 hbase.http.max.threads
-10
+16
 
   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 serverNameToServerNameWithoutCode = new 
HashMap<>();
+// This is not used? Findbugs says so: Map 
serverNameToServerNameWithoutCode = new HashMap<>();
 Map 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 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);
+

hbase git commit: HBASE-18224 Upgrade Jetty

2017-08-24 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master 25ff9d0bb -> 3b444a066


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/3b444a06
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3b444a06
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3b444a06

Branch: refs/heads/master
Commit: 3b444a066c0c699aff749713209950198f1b21e4
Parents: 25ff9d0
Author: Michael Stack 
Authored: Tue Aug 22 13:33:08 2017 -0700
Committer: Michael Stack 
Committed: Wed Aug 23 23:12:59 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/3b444a06/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 43efd4b..6b8849e 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1603,7 +1603,7 @@ possible configurations would overwhelm and obscure the 
important.
   
   
 hbase.http.max.threads
-10
+16
 
   The maximum number of threads that the HTTP Server will create in its
   ThreadPool.

http://git-wip-us.apache.org/repos/asf/hbase/blob/3b444a06/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 serverNameToServerNameWithoutCode = new 
HashMap<>();
+// This is not used? Findbugs says so: Map 
serverNameToServerNameWithoutCode = new HashMap<>();
 Map 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 entry : 
clusterState.entrySet()) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3b444a06/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);
+