From 79e4c9d925a368b5f4baec4f2fa201bf19af49f6 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 22 Mar 2018 10:47:47 -0700 Subject: [PATCH] Revert "HBASE-20224 Web UI is broken in standalone mode" Broke shell tests. This reverts commit dd9fe813ecc605f5e8b3c8598824f4e9a0a1eed6. --- hbase-client/src/test/resources/hbase-site.xml | 7 ------- 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 ------- .../java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 2 +- .../java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 2 +- hbase-server/src/test/resources/hbase-site.xml | 7 ------- hbase-thrift/src/test/resources/hbase-site.xml | 7 ------- 8 files changed, 2 insertions(+), 44 deletions(-) diff --git a/hbase-client/src/test/resources/hbase-site.xml b/hbase-client/src/test/resources/hbase-site.xml index 858d4285cf0..99d2ab8d1fb 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-mapreduce/src/test/resources/hbase-site.xml b/hbase-mapreduce/src/test/resources/hbase-site.xml index 34802d0e9c1..64a19644358 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 a1cc27ebf16..114ee8a23c1 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 be7b49243a4..2bd3ee45a42 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-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index 5c8ddd9ba64..e19e53bfc51 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 7b65371fce0..a6522847276 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 34802d0e9c1..64a19644358 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-thrift/src/test/resources/hbase-site.xml b/hbase-thrift/src/test/resources/hbase-site.xml index b354a2b3867..b3fb0d90c50 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). - -