From d608aaf497ee751ba9ee9f6e2c17a7b233fa3787 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Wed, 18 Apr 2018 22:10:19 -0400 Subject: [PATCH 1/2] Revert "HBASE-20224 Web UI is broken in standalone mode" This reverts commit 2cff656dfacf86de5000e24a905aab45407880a3. Revert "HBASE-20224 Web UI is broken in standalone mode; ADDENDUM" This reverts commit 23d373db3e37e4ca12bf52c4b3b5ff02c8887e08. Revert "HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-archetypes module" This reverts commit ee3c4303bf13e59df3e61b1c611f9c3a813ac0ac. Revert "HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-endpoint and hbase-rsgroup modules" This reverts commit cba88d15eb450e49b004651f418e7e6a49666a0d. --- .../src/test/resources/hbase-site.xml | 39 ---------------------- .../src/test/resources/hbase-site.xml | 39 ---------------------- hbase-client/src/test/resources/hbase-site.xml | 7 ---- hbase-endpoint/src/test/resources/hbase-site.xml | 39 ---------------------- hbase-examples/src/test/resources/hbase-site.xml | 35 ------------------- hbase-mapreduce/src/test/resources/hbase-site.xml | 7 ---- hbase-procedure/src/test/resources/hbase-site.xml | 7 ---- hbase-rest/src/test/resources/hbase-site.xml | 7 ---- hbase-rsgroup/src/test/resources/hbase-site.xml | 39 ---------------------- .../org/apache/hadoop/hbase/LocalHBaseCluster.java | 2 +- .../org/apache/hadoop/hbase/MiniHBaseCluster.java | 2 +- hbase-server/src/test/resources/hbase-site.xml | 7 ---- hbase-shell/src/test/resources/hbase-site.xml | 39 ---------------------- hbase-thrift/src/test/resources/hbase-site.xml | 7 ---- 14 files changed, 2 insertions(+), 274 deletions(-) delete mode 100644 hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml delete mode 100644 hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml delete mode 100644 hbase-endpoint/src/test/resources/hbase-site.xml delete mode 100644 hbase-examples/src/test/resources/hbase-site.xml delete mode 100644 hbase-rsgroup/src/test/resources/hbase-site.xml delete mode 100644 hbase-shell/src/test/resources/hbase-site.xml diff --git a/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml b/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml deleted file mode 100644 index 858d4285cf..0000000000 --- a/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - hbase.defaults.for.version.skip - true - - - hbase.hconnection.threads.keepalivetime - 3 - - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - - diff --git a/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml b/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml deleted file mode 100644 index 858d4285cf..0000000000 --- a/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - hbase.defaults.for.version.skip - true - - - hbase.hconnection.threads.keepalivetime - 3 - - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - - diff --git a/hbase-client/src/test/resources/hbase-site.xml b/hbase-client/src/test/resources/hbase-site.xml index 858d4285cf..99d2ab8d1f 100644 --- a/hbase-client/src/test/resources/hbase-site.xml +++ b/hbase-client/src/test/resources/hbase-site.xml @@ -29,11 +29,4 @@ hbase.hconnection.threads.keepalivetime 3 - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - diff --git a/hbase-endpoint/src/test/resources/hbase-site.xml b/hbase-endpoint/src/test/resources/hbase-site.xml deleted file mode 100644 index 858d4285cf..0000000000 --- a/hbase-endpoint/src/test/resources/hbase-site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - hbase.defaults.for.version.skip - true - - - hbase.hconnection.threads.keepalivetime - 3 - - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - - diff --git a/hbase-examples/src/test/resources/hbase-site.xml b/hbase-examples/src/test/resources/hbase-site.xml deleted file mode 100644 index 697567e9f3..0000000000 --- a/hbase-examples/src/test/resources/hbase-site.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - hbase.defaults.for.version.skip - true - - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - - diff --git a/hbase-mapreduce/src/test/resources/hbase-site.xml b/hbase-mapreduce/src/test/resources/hbase-site.xml index 34802d0e9c..64a1964435 100644 --- a/hbase-mapreduce/src/test/resources/hbase-site.xml +++ b/hbase-mapreduce/src/test/resources/hbase-site.xml @@ -158,11 +158,4 @@ hbase.hconnection.threads.keepalivetime 3 - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - diff --git a/hbase-procedure/src/test/resources/hbase-site.xml b/hbase-procedure/src/test/resources/hbase-site.xml index a1cc27ebf1..114ee8a23c 100644 --- a/hbase-procedure/src/test/resources/hbase-site.xml +++ b/hbase-procedure/src/test/resources/hbase-site.xml @@ -41,11 +41,4 @@ WARNING: Doing so may expose you to additional risk of data loss! - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - diff --git a/hbase-rest/src/test/resources/hbase-site.xml b/hbase-rest/src/test/resources/hbase-site.xml index be7b49243a..2bd3ee45a4 100644 --- a/hbase-rest/src/test/resources/hbase-site.xml +++ b/hbase-rest/src/test/resources/hbase-site.xml @@ -139,11 +139,4 @@ Skip sanity checks in tests - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - diff --git a/hbase-rsgroup/src/test/resources/hbase-site.xml b/hbase-rsgroup/src/test/resources/hbase-site.xml deleted file mode 100644 index 858d4285cf..0000000000 --- a/hbase-rsgroup/src/test/resources/hbase-site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - hbase.defaults.for.version.skip - true - - - hbase.hconnection.threads.keepalivetime - 3 - - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - - diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index 5c8ddd9ba6..e19e53bfc5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -141,7 +141,7 @@ public class LocalHBaseCluster { // Always have masters and regionservers come up on port '0' so we don't // clash over default ports. - if (conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) { + if (conf.getBoolean(ASSIGN_RANDOM_PORTS, true)) { conf.set(HConstants.MASTER_PORT, "0"); conf.set(HConstants.REGIONSERVER_PORT, "0"); if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java index 7b65371fce..a652284727 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java @@ -108,7 +108,7 @@ public class MiniHBaseCluster extends HBaseCluster { Class regionserverClass) throws IOException, InterruptedException { super(conf); - if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) { + if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true)) { conf.set(HConstants.MASTER_PORT, "0"); if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) { conf.set(HConstants.MASTER_INFO_PORT, "0"); diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml index 34802d0e9c..64a1964435 100644 --- a/hbase-server/src/test/resources/hbase-site.xml +++ b/hbase-server/src/test/resources/hbase-site.xml @@ -158,11 +158,4 @@ hbase.hconnection.threads.keepalivetime 3 - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - diff --git a/hbase-shell/src/test/resources/hbase-site.xml b/hbase-shell/src/test/resources/hbase-site.xml deleted file mode 100644 index 858d4285cf..0000000000 --- a/hbase-shell/src/test/resources/hbase-site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - hbase.defaults.for.version.skip - true - - - hbase.hconnection.threads.keepalivetime - 3 - - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - - diff --git a/hbase-thrift/src/test/resources/hbase-site.xml b/hbase-thrift/src/test/resources/hbase-site.xml index b354a2b386..b3fb0d90c5 100644 --- a/hbase-thrift/src/test/resources/hbase-site.xml +++ b/hbase-thrift/src/test/resources/hbase-site.xml @@ -154,11 +154,4 @@ Enable replay sanity checks on procedure tests. - - hbase.localcluster.assign.random.ports - true - - Assign random ports to master and RS info server (UI). - - -- 2.16.3 From 102b1b524cbba07d7f5564d9b1f51365c63f5742 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Wed, 18 Apr 2018 22:27:03 -0400 Subject: [PATCH 2/2] HBASE-20224 Force standalone mode to not use random ports --- conf/hbase-site.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conf/hbase-site.xml b/conf/hbase-site.xml index c516ac7291..1827241b85 100644 --- a/conf/hbase-site.xml +++ b/conf/hbase-site.xml @@ -21,4 +21,11 @@ */ --> + + hbase.localcluster.assign.random.ports + false + + Assign random ports to master and RS info server (UI). + + -- 2.16.3