Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-client/src/test/resources/hbase-site.xml
View File

@ -29,11 +29,4 @@
<name>hbase.hconnection.threads.keepalivetime</name>
<value>3</value>
</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>

7
hbase-mapreduce/src/test/resources/hbase-site.xml
View File

@ -158,11 +158,4 @@
<name>hbase.hconnection.threads.keepalivetime</name>
<value>3</value>
</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>

7
hbase-procedure/src/test/resources/hbase-site.xml
View File

@ -41,11 +41,4 @@
WARNING: Doing so may expose you to additional risk of data loss!
</description>
</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>

7
hbase-rest/src/test/resources/hbase-site.xml
View File

@ -139,11 +139,4 @@
<description>Skip sanity checks in tests
</description>
</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>

2
hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
View File

@ -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) {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
View File

@ -108,7 +108,7 @@ public class MiniHBaseCluster extends HBaseCluster {
Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> 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");

7
hbase-server/src/test/resources/hbase-site.xml
View File

@ -158,11 +158,4 @@
<name>hbase.hconnection.threads.keepalivetime</name>
<value>3</value>
</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>

7
hbase-thrift/src/test/resources/hbase-site.xml
View File

@ -154,11 +154,4 @@
Enable replay sanity checks on procedure tests.
</description>
</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>