Index: src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java (revision 1311771) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java (working copy) @@ -33,6 +33,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.util.Strings; import org.apache.hadoop.net.DNS; import org.apache.hadoop.util.StringUtils; import org.apache.zookeeper.server.ServerConfig; @@ -87,9 +88,9 @@ long myId = -1; Configuration conf = HBaseConfiguration.create(); - String myAddress = DNS.getDefaultHost( + String myAddress = Strings.domainNamePointerToHostName(DNS.getDefaultHost( conf.get("hbase.zookeeper.dns.interface","default"), - conf.get("hbase.zookeeper.dns.nameserver","default")); + conf.get("hbase.zookeeper.dns.nameserver","default"))); List ips = new ArrayList(); Index: src/main/java/org/apache/hadoop/hbase/util/Strings.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/Strings.java (revision 1311771) +++ src/main/java/org/apache/hadoop/hbase/util/Strings.java (working copy) @@ -72,4 +72,4 @@ return null; return dnPtr.endsWith(".") ? dnPtr.substring(0, dnPtr.length()-1) : dnPtr; } -} \ No newline at end of file +} Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1311771) +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -137,6 +137,7 @@ import org.apache.hadoop.hbase.util.InfoServer; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Sleeper; +import org.apache.hadoop.hbase.util.Strings; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.VersionInfo; import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker; @@ -372,9 +373,9 @@ this.stopped = false; // Server to handle client requests. - String hostname = DNS.getDefaultHost( + String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost( conf.get("hbase.regionserver.dns.interface", "default"), - conf.get("hbase.regionserver.dns.nameserver", "default")); + conf.get("hbase.regionserver.dns.nameserver", "default"))); int port = conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT); // Creation of a HSA will force a resolve. Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1311771) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -94,6 +94,7 @@ import org.apache.hadoop.hbase.util.InfoServer; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Sleeper; +import org.apache.hadoop.hbase.util.Strings; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.VersionInfo; import org.apache.hadoop.hbase.zookeeper.ClusterId; @@ -234,9 +235,9 @@ // Set how many times to retry talking to another server over HConnection. HConnectionManager.setServerSideHConnectionRetries(this.conf, LOG); // Server to handle client requests. - String hostname = DNS.getDefaultHost( + String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost( conf.get("hbase.master.dns.interface", "default"), - conf.get("hbase.master.dns.nameserver", "default")); + conf.get("hbase.master.dns.nameserver", "default"))); int port = conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT); // Creation of a HSA will force a resolve. InetSocketAddress initialIsa = new InetSocketAddress(hostname, port);