Repository: hbase
Updated Branches:
refs/heads/branch-1.1 cc2b70cf0 -> 6602cd006
HBASE-14277 TestRegionServerHostname.testRegionServerHostname may fail at host
with a case sensitive name
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6602cd00
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6602cd00
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6602cd00
Branch: refs/heads/branch-1.1
Commit: 6602cd006159ddcadf498596dc82337506fd5cd7
Parents: cc2b70c
Author: Liu Shaohui <[email protected]>
Authored: Mon Aug 24 09:59:32 2015 +0800
Committer: Liu Shaohui <[email protected]>
Committed: Mon Aug 24 11:43:52 2015 +0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/TestRegionServerHostname.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6602cd00/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 29af324..9c6fe47 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
@@ -92,7 +92,8 @@ public class TestRegionServerHostname {
}
assertTrue(servers.size() == NUM_RS);
for (String server : servers) {
- assertTrue(server.startsWith(hostName+","));
+ assertTrue("From zookeeper: " + server + " hostname: " + hostName,
+ server.startsWith(hostName.toLowerCase()+","));
}
zkw.close();
} finally {
