Index: CHANGES.txt =================================================================== --- CHANGES.txt (revision 1303132) +++ CHANGES.txt (working copy) @@ -5,6 +5,8 @@ HBASE-5568 Multi concurrent flushcache() for one region could cause data loss (Chunhui) HBASE-5482 In 0.90, balancer algo leading to same region balanced twice and picking same region with Src and Destination as same RS. (Ram) + HBASE-5593 Reverse DNS resolution in regionServerStartup() does not strip trailing dot + (David S. Wang) IMPROVEMENT HBASE-5588 Deprecate/remove AssignmentManager#clearRegionFromTransition Index: src/test/java/org/apache/hadoop/hbase/master/TestMaster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestMaster.java (revision 1303133) +++ src/test/java/org/apache/hadoop/hbase/master/TestMaster.java (working copy) @@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HServerAddress; +import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.catalog.MetaReader; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -37,6 +38,7 @@ import java.io.IOException; import java.util.List; +import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -66,6 +68,19 @@ } @Test + public void testMasterCorrectHostnameFormatForOnlineRegions() throws Exception { + MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); + HMaster m = cluster.getMaster(); + for (Map.Entry e: + m.getServerManager().getOnlineServers().entrySet()) { + HServerInfo hsi = e.getValue(); + String hostName = hsi.getHostname(); + LOG.info("Online region hostname: " + hostName); + assertFalse(hostName.endsWith(".")); + } + } + + @Test public void testMasterOpsWhileSplitting() throws Exception { MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); HMaster m = cluster.getMaster(); Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1303132) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -652,7 +652,8 @@ // Everafter, the HSI combination 'server name' is what uniquely identifies // the incoming RegionServer. InetSocketAddress address = new InetSocketAddress( - HBaseServer.getRemoteIp().getHostName(), + Strings.domainNamePointerToHostName( + HBaseServer.getRemoteIp().getHostName()), serverInfo.getServerAddress().getPort()); serverInfo.setServerAddress(new HServerAddress(address));