You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/04/10 18:15:35 UTC
svn commit: r1311825 - in
/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase:
master/HMaster.java regionserver/HRegionServer.java util/Strings.java
zookeeper/HQuorumPeer.java
Author: stack
Date: Tue Apr 10 16:15:34 2012
New Revision: 1311825
URL: http://svn.apache.org/viewvc?rev=1311825&view=rev
Log:
HBASE-5758 Forward port "HBASE-4109 Hostname returned via reverse dns lookup contains trailing period if configured interface is not default
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Strings.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1311825&r1=1311824&r2=1311825&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Apr 10 16:15:34 2012
@@ -94,6 +94,7 @@ import org.apache.hadoop.hbase.util.HasT
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 @@ Server {
// 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);
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1311825&r1=1311824&r2=1311825&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Apr 10 16:15:34 2012
@@ -137,6 +137,7 @@ import org.apache.hadoop.hbase.util.FSUt
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 @@ public class HRegionServer implements HR
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.
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Strings.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Strings.java?rev=1311825&r1=1311824&r2=1311825&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Strings.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Strings.java Tue Apr 10 16:15:34 2012
@@ -72,4 +72,4 @@ public class Strings {
return null;
return dnPtr.endsWith(".") ? dnPtr.substring(0, dnPtr.length()-1) : dnPtr;
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java?rev=1311825&r1=1311824&r2=1311825&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java Tue Apr 10 16:15:34 2012
@@ -33,6 +33,7 @@ import java.util.Map.Entry;
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 @@ public class HQuorumPeer {
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<String> ips = new ArrayList<String>();