commit ced43b6f50b91f0c69ad12d84b26a06b901b2e64 Author: Enis Soztutar Date: Fri Apr 17 18:46:21 2015 -0700 HBASE-13481 Master should respect master (old) DNS/bind related configurations 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 5054ca8..6a5cb66 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 @@ -1671,13 +1671,16 @@ public class HRegionServer extends HasThread implements private int putUpWebUI() throws IOException { int port = this.conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT); + String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0"); + if(this instanceof HMaster) { port = conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT); + addr = this.conf.get("hbase.master.info.bindAddress", "0.0.0.0"); } // -1 is for disabling info server if (port < 0) return port; - String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0"); + if (!Addressing.isLocalAddress(InetAddress.getByName(addr))) { String msg = "Failed to start http info server. Address " + addr diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 07b98f3..04784f8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -764,17 +764,24 @@ public class RSRpcServices implements HBaseRPCErrorHandler, throw new IllegalArgumentException(e); } // Server to handle client requests. - String hostname = getHostname(rs.conf); - int port = rs.conf.getInt(HConstants.REGIONSERVER_PORT, - HConstants.DEFAULT_REGIONSERVER_PORT); + InetSocketAddress initialIsa; + InetSocketAddress bindAddress; if(this instanceof MasterRpcServices) { - port = rs.conf.getInt(HConstants.MASTER_PORT, + String hostname = getHostname(rs.conf, true); + int port = rs.conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT); + // Creation of a HSA will force a resolve. + initialIsa = new InetSocketAddress(hostname, port); + bindAddress = new InetSocketAddress(rs.conf.get("hbase.master.ipc.address", hostname), port); + } else { + String hostname = getHostname(rs.conf, false); + int port = rs.conf.getInt(HConstants.REGIONSERVER_PORT, + HConstants.DEFAULT_REGIONSERVER_PORT); + // Creation of a HSA will force a resolve. + initialIsa = new InetSocketAddress(hostname, port); + bindAddress = new InetSocketAddress( + rs.conf.get("hbase.regionserver.ipc.address", hostname), port); } - // Creation of a HSA will force a resolve. - InetSocketAddress initialIsa = new InetSocketAddress(hostname, port); - InetSocketAddress bindAddress = new InetSocketAddress( - rs.conf.get("hbase.regionserver.ipc.address", hostname), port); if (initialIsa.getAddress() == null) { throw new IllegalArgumentException("Failed resolve of " + initialIsa); } @@ -800,10 +807,12 @@ public class RSRpcServices implements HBaseRPCErrorHandler, rs.setName(name); } - public static String getHostname(Configuration conf) throws UnknownHostException { + public static String getHostname(Configuration conf, boolean isMaster) + throws UnknownHostException { + String masterOrRS = isMaster ? "master" : "regionserver"; return Strings.domainNamePointerToHostName(DNS.getDefaultHost( - conf.get("hbase.regionserver.dns.interface", "default"), - conf.get("hbase.regionserver.dns.nameserver", "default"))); + conf.get("hbase." + masterOrRS + ".dns.interface", "default"), + conf.get("hbase." + masterOrRS + ".dns.nameserver", "default"))); } RegionScanner getScanner(long scannerId) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java index 0db5c00..5aeff5c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java @@ -277,6 +277,7 @@ public class RatioBasedCompactionPolicy extends CompactionPolicy { * @param filesToCompact Files to compact. Can be null. * @return True if we should run a major compaction. */ + @Override public boolean isMajorCompaction(final Collection filesToCompact) throws IOException { boolean result = false; @@ -300,7 +301,7 @@ public class RatioBasedCompactionPolicy extends CompactionPolicy { if (sf.isMajorCompaction() && (cfTtl == HConstants.FOREVER || oldest < cfTtl)) { float blockLocalityIndex = sf.getHDFSBlockDistribution().getBlockLocalityIndex( - RSRpcServices.getHostname(comConf.conf) + RSRpcServices.getHostname(comConf.conf, false) ); if (blockLocalityIndex < comConf.getMinLocalityToForceCompact()) { if (LOG.isDebugEnabled()) { @@ -375,6 +376,7 @@ public class RatioBasedCompactionPolicy extends CompactionPolicy { * @param compactionSize Total size of some compaction * @return whether this should be a large or small compaction */ + @Override public boolean throttleCompaction(long compactionSize) { return compactionSize > comConf.getThrottlePoint(); }