Repository: hbase
Updated Branches:
refs/heads/branch-1.2 8eb573f83 -> 65f1e9ebc
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/65f1e9eb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65f1e9eb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65f1e9eb
Branch: refs/heads/branch-1.2
Commit: 65f1e9ebce970e991ec3c854a3ec56a5389920b7
Parents: 8eb573f
Author: Liu Shaohui <[email protected]>
Authored: Mon Aug 24 09:59:32 2015 +0800
Committer: Liu Shaohui <[email protected]>
Committed: Mon Aug 24 11:42:50 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/65f1e9eb/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 {
