Index: CHANGES.txt =================================================================== --- CHANGES.txt (revision 1303177) +++ 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/util/TestStrings.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/util/TestStrings.java (revision 0) +++ src/test/java/org/apache/hadoop/hbase/util/TestStrings.java (revision 0) @@ -0,0 +1,38 @@ +/* + * Copyright The Apache Software Foundation + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.util; + +import org.junit.Test; + +import static junit.framework.Assert.assertEquals; + +import org.apache.hadoop.hbase.util.Strings; + +/** + * Tests functions in the Strings util class + */ +public class TestStrings { + + @Test + public void testDomainNamePointerToHostName() { + assertEquals(Strings.domainNamePointerToHostName("hbase.apache.org."), + "hbase.apache.org"); + } +} Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1303177) +++ 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));