From f781701ddba990b68a7c0c757a8dd09729ed0397 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 Changes for HBASE-20027 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. --- 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 ++++ .../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 ++++ 9 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 hbase-shell/src/test/resources/hbase-site.xml diff --git a/hbase-client/src/test/resources/hbase-site.xml b/hbase-client/src/test/resources/hbase-site.xml index 99d2ab8d1fbb98173c6c47ae3b93e3338322907e..858d4285cf0af62a9c81293b1803a711032b0a65 100644 --- a/hbase-client/src/test/resources/hbase-site.xml +++ b/hbase-client/src/test/resources/hbase-site.xml @@ -29,4 +29,11 @@ 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 64a1964435897fbd0faa683aeb9600a6a5140dae..34802d0e9c1f246614be33ae8836c5aa6102db2f 100644 --- a/hbase-mapreduce/src/test/resources/hbase-site.xml +++ b/hbase-mapreduce/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). + + diff --git a/hbase-procedure/src/test/resources/hbase-site.xml b/hbase-procedure/src/test/resources/hbase-site.xml index 114ee8a23c14f67b9369127c63edf14c2c0f94de..a1cc27ebf16fef9c9a9e161104fc23f3c77b04a3 100644 --- a/hbase-procedure/src/test/resources/hbase-site.xml +++ b/hbase-procedure/src/test/resources/hbase-site.xml @@ -41,4 +41,11 @@ 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 2bd3ee45a42f2ac06266f3a26b4d9dfd4af2d597..be7b49243a4d2d57cd72101870d15a1e8d5a54c6 100644 --- a/hbase-rest/src/test/resources/hbase-site.xml +++ b/hbase-rest/src/test/resources/hbase-site.xml @@ -139,4 +139,11 @@ 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 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). + + diff --git a/hbase-shell/src/test/resources/hbase-site.xml b/hbase-shell/src/test/resources/hbase-site.xml new file mode 100644 index 0000000000000000000000000000000000000000..858d4285cf0af62a9c81293b1803a711032b0a65 --- /dev/null +++ b/hbase-shell/src/test/resources/hbase-site.xml @@ -0,0 +1,39 @@ + + + + + + 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 b3fb0d90c50c34ffa474e927dde076ef3b089bdc..b354a2b386733aa5d13bb4bbe5a131429bb5214c 100644 --- a/hbase-thrift/src/test/resources/hbase-site.xml +++ b/hbase-thrift/src/test/resources/hbase-site.xml @@ -154,4 +154,11 @@ 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.1