From b24466d25af25bcc82073dad62cc0d6b6c49f58e Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Wed, 21 Mar 2018 12:48:18 -0700 Subject: [PATCH] HBASE-20224 Web UI is broken in standalone mode These changes build further on top of patch for HBASE-20027 as it seem to cause UI not showing up on default port in standalone mode. For concurrent unit test execution, individual tests can set hbase.localcluster.assign.random.ports to true or modify test/resources/hbase-site.xml in respective directories. --- .../src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 2 +- hbase-server/src/test/resources/hbase-site.xml | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) 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 e19e53bfc517a68511605746e801a90855bdf829..5c8ddd9ba642b46da6583b58bc11fe34a354c26d 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, true)) { + if (conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) { 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 a652284727641f0f324b73d387960f05f2f3ac44..7b65371fce0706e7330e904d3500fda803584565 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, true)) { + if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) { 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 64a1964435897fbd0faa683aeb9600a6a5140dae..34802d0e9c1f246614be33ae8836c5aa6102db2f 100644 --- a/hbase-server/src/test/resources/hbase-site.xml +++ b/hbase-server/src/test/resources/hbase-site.xml @@ -158,4 +158,11 @@ hbase.hconnection.threads.keepalivetime 3 + + hbase.localcluster.assign.random.ports + true + + Assign random ports to master and RS info server (UI). + + -- 2.16.1