diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 52030e5..6b512da 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -460,12 +460,12 @@ MasterServices, Server { // login the zookeeper client principal (if using security) ZKUtil.loginClient(this.conf, "hbase.zookeeper.client.keytab.file", - "hbase.zookeeper.client.kerberos.principal", this.isa.getHostName()); + "hbase.zookeeper.client.kerberos.principal", hostname); // initialize server principal (if using secure Hadoop) UserProvider provider = UserProvider.instantiate(conf); provider.login("hbase.master.keytab.file", - "hbase.master.kerberos.principal", this.isa.getHostName()); + "hbase.master.kerberos.principal", hostname); LOG.info("hbase.rootdir=" + FSUtils.getRootDir(this.conf) + ", hbase.cluster.distributed=" + this.conf.getBoolean("hbase.cluster.distributed", false)); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index cc26cda..df7bbdf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -568,12 +568,11 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, HConstants.DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD); - - // Server to handle client requests. - String hostname = conf.get("hbase.regionserver.ipc.address", - Strings.domainNamePointerToHostName(DNS.getDefaultHost( + String h = 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"))); + // Server to handle client requests. + String hostname = conf.get("hbase.regionserver.ipc.address", h); int port = conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT); // Creation of a HSA will force a resolve. @@ -611,11 +610,11 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa // login the zookeeper client principal (if using security) ZKUtil.loginClient(this.conf, "hbase.zookeeper.client.keytab.file", - "hbase.zookeeper.client.kerberos.principal", this.isa.getHostName()); + "hbase.zookeeper.client.kerberos.principal", h); // login the server principal (if using secure Hadoop) userProvider.login("hbase.regionserver.keytab.file", - "hbase.regionserver.kerberos.principal", this.isa.getHostName()); + "hbase.regionserver.kerberos.principal", h); regionServerAccounting = new RegionServerAccounting(); cacheConfig = new CacheConfig(conf); uncaughtExceptionHandler = new UncaughtExceptionHandler() {