svn commit: r1488837 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[stack]

Author: stack
Date: Mon Jun  3 03:51:52 2013
New Revision: 1488837

URL: http://svn.apache.org/r1488837
Log:
HBASE-8640 ServerName in master may not initialize with the configured ipc 
address of hbase.master.ipc.address

Modified:
    
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1488837&r1=1488836&r2=1488837&view=diff
==============================================================================
--- 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
(original)
+++ 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
Mon Jun  3 03:51:52 2013
@@ -284,23 +284,16 @@ 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 = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
-      conf.get("hbase.master.dns.interface", "default"),
-      conf.get("hbase.master.dns.nameserver", "default")));
+    String hostname = conf.get("hbase.master.ipc.address",
+      Strings.domainNamePointerToHostName(DNS.getDefaultHost(
+        conf.get("hbase.master.dns.interface", "default"),
+        conf.get("hbase.master.dns.nameserver", "default"))));
     int port = conf.getInt(HConstants.MASTER_PORT, 
HConstants.DEFAULT_MASTER_PORT);
     // Test that the hostname is reachable
     InetSocketAddress initialIsa = new InetSocketAddress(hostname, port);
     if (initialIsa.getAddress() == null) {
       throw new IllegalArgumentException("Failed resolve of hostname " + 
initialIsa);
     }
-    // Verify that the bind address is reachable if set
-    String bindAddress = conf.get("hbase.master.ipc.address");
-    if (bindAddress != null) {
-      initialIsa = new InetSocketAddress(bindAddress, port);
-      if (initialIsa.getAddress() == null) {
-        throw new IllegalArgumentException("Failed resolve of bind address " + 
initialIsa);
-      }
-    }
     int numHandlers = conf.getInt("hbase.master.handler.count",
       conf.getInt("hbase.regionserver.handler.count", 25));
     this.rpcServer = HBaseRPC.getServer(this,
@@ -313,7 +306,7 @@ Server {
         0); // this is a DNC w/o high priority handlers
     // Set our address.
     this.isa = this.rpcServer.getListenerAddress();
-    this.serverName = new ServerName(hostname,
+    this.serverName = new ServerName(this.isa.getHostName(),
       this.isa.getPort(), System.currentTimeMillis());
     this.rsFatals = new MemoryBoundedLogMessageBuffer(
         conf.getLong("hbase.master.buffer.for.rs.fatals", 1*1024*1024));