You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/03/22 17:48:12 UTC
hbase git commit: Revert "HBASE-20224 Web UI is broken in standalone
mode"
Repository: hbase
Updated Branches:
refs/heads/branch-2 dd9fe813e -> 79e4c9d92
Revert "HBASE-20224 Web UI is broken in standalone mode"
Broke shell tests.
This reverts commit dd9fe813ecc605f5e8b3c8598824f4e9a0a1eed6.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/79e4c9d9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/79e4c9d9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/79e4c9d9
Branch: refs/heads/branch-2
Commit: 79e4c9d925a368b5f4baec4f2fa201bf19af49f6
Parents: dd9fe81
Author: Michael Stack <st...@apache.org>
Authored: Thu Mar 22 10:47:47 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu Mar 22 10:47:47 2018 -0700
----------------------------------------------------------------------
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 -------
.../main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 2 +-
.../test/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-client/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 858d428..99d2ab8 100644
--- a/hbase-client/src/test/resources/hbase-site.xml
+++ b/hbase-client/src/test/resources/hbase-site.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-mapreduce/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/resources/hbase-site.xml b/hbase-mapreduce/src/test/resources/hbase-site.xml
index 34802d0..64a1964 100644
--- a/hbase-mapreduce/src/test/resources/hbase-site.xml
+++ b/hbase-mapreduce/src/test/resources/hbase-site.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-procedure/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/resources/hbase-site.xml b/hbase-procedure/src/test/resources/hbase-site.xml
index a1cc27e..114ee8a 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!
</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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-rest/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/resources/hbase-site.xml b/hbase-rest/src/test/resources/hbase-site.xml
index be7b492..2bd3ee4 100644
--- a/hbase-rest/src/test/resources/hbase-site.xml
+++ b/hbase-rest/src/test/resources/hbase-site.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
----------------------------------------------------------------------
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 5c8ddd9..e19e53b 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) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
----------------------------------------------------------------------
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 7b65371..a652284 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<? 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");
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-server/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml
index 34802d0..64a1964 100644
--- a/hbase-server/src/test/resources/hbase-site.xml
+++ b/hbase-server/src/test/resources/hbase-site.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/79e4c9d9/hbase-thrift/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/test/resources/hbase-site.xml b/hbase-thrift/src/test/resources/hbase-site.xml
index b354a2b..b3fb0d9 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.
</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>