Revert "HBASE-20224 Web UI is broken in standalone mode"

Broke shell tests.

This reverts commit dd9fe813ec.
This commit is contained in:
Michael Stack 2018-03-22 10:47:47 -07:00
parent dd9fe813ec
commit 79e4c9d925
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
8 changed files with 2 additions and 44 deletions

View File

@ -29,11 +29,4 @@
<name>hbase.hconnection.threads.keepalivetime</name> <name>hbase.hconnection.threads.keepalivetime</name>
<value>3</value> <value>3</value>
</property> </property>
<property>
<name>hbase.localcluster.assign.random.ports</name>
<value>true</value>
<description>
Assign random ports to master and RS info server (UI).
</description>
</property>
</configuration> </configuration>

View File

@ -158,11 +158,4 @@
<name>hbase.hconnection.threads.keepalivetime</name> <name>hbase.hconnection.threads.keepalivetime</name>
<value>3</value> <value>3</value>
</property> </property>
<property>
<name>hbase.localcluster.assign.random.ports</name>
<value>true</value>
<description>
Assign random ports to master and RS info server (UI).
</description>
</property>
</configuration> </configuration>

View File

@ -41,11 +41,4 @@
WARNING: Doing so may expose you to additional risk of data loss! WARNING: Doing so may expose you to additional risk of data loss!
</description> </description>
</property> </property>
<property>
<name>hbase.localcluster.assign.random.ports</name>
<value>true</value>
<description>
Assign random ports to master and RS info server (UI).
</description>
</property>
</configuration> </configuration>

View File

@ -139,11 +139,4 @@
<description>Skip sanity checks in tests <description>Skip sanity checks in tests
</description> </description>
</property> </property>
<property>
<name>hbase.localcluster.assign.random.ports</name>
<value>true</value>
<description>
Assign random ports to master and RS info server (UI).
</description>
</property>
</configuration> </configuration>

View File

@ -141,7 +141,7 @@ public class LocalHBaseCluster {
// Always have masters and regionservers come up on port '0' so we don't // Always have masters and regionservers come up on port '0' so we don't
// clash over default ports. // 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.MASTER_PORT, "0");
conf.set(HConstants.REGIONSERVER_PORT, "0"); conf.set(HConstants.REGIONSERVER_PORT, "0");
if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) { if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) {

View File

@ -108,7 +108,7 @@ public class MiniHBaseCluster extends HBaseCluster {
Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass) Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
throws IOException, InterruptedException { throws IOException, InterruptedException {
super(conf); super(conf);
if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) { if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true)) {
conf.set(HConstants.MASTER_PORT, "0"); conf.set(HConstants.MASTER_PORT, "0");
if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) { if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {
conf.set(HConstants.MASTER_INFO_PORT, "0"); conf.set(HConstants.MASTER_INFO_PORT, "0");

View File

@ -158,11 +158,4 @@
<name>hbase.hconnection.threads.keepalivetime</name> <name>hbase.hconnection.threads.keepalivetime</name>
<value>3</value> <value>3</value>
</property> </property>
<property>
<name>hbase.localcluster.assign.random.ports</name>
<value>true</value>
<description>
Assign random ports to master and RS info server (UI).
</description>
</property>
</configuration> </configuration>

View File

@ -154,11 +154,4 @@
Enable replay sanity checks on procedure tests. Enable replay sanity checks on procedure tests.
</description> </description>
</property> </property>
<property>
<name>hbase.localcluster.assign.random.ports</name>
<value>true</value>
<description>
Assign random ports to master and RS info server (UI).
</description>
</property>
</configuration> </configuration>