You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/04/20 00:16:34 UTC
hbase git commit: HBASE-13481 Addendum sets MASTER_HOSTNAME_KEY config
Repository: hbase
Updated Branches:
refs/heads/master 176261af7 -> 3baab26d0
HBASE-13481 Addendum sets MASTER_HOSTNAME_KEY config
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3baab26d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3baab26d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3baab26d
Branch: refs/heads/master
Commit: 3baab26d0b8e70ca99ac00bd79d7e6683fa0a2ca
Parents: 176261a
Author: tedyu <yu...@gmail.com>
Authored: Sun Apr 19 15:16:21 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Sun Apr 19 15:16:21 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/TestRegionServerHostname.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3baab26d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
index e02090b..1c42c06 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
@@ -88,6 +88,7 @@ public class TestRegionServerHostname {
String hostName = addr.getHostName();
LOG.info("Found " + hostName + " on " + ni);
+ TEST_UTIL.getConfiguration().set(HRegionServer.MASTER_HOSTNAME_KEY, hostName);
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, hostName);
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
try {
@@ -96,7 +97,8 @@ public class TestRegionServerHostname {
// there would be NUM_RS+1 children - one for the master
assertTrue(servers.size() == NUM_RS+1);
for (String server : servers) {
- assertTrue(server.startsWith(hostName+","));
+ assertTrue("From zookeeper: " + server + " hostname: " + hostName,
+ server.startsWith(hostName+","));
}
zkw.close();
} finally {