You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/04/16 20:55:14 UTC
hbase git commit: HBASE-13479 [branch-1.0] Master should not bind to
region server ports
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 d2cefb5c2 -> 071298c65
HBASE-13479 [branch-1.0] Master should not bind to region server ports
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/071298c6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/071298c6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/071298c6
Branch: refs/heads/branch-1.0
Commit: 071298c65f450a012e5d1a56f861c981228b8e22
Parents: d2cefb5
Author: Enis Soztutar <en...@apache.org>
Authored: Thu Apr 16 11:54:17 2015 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Thu Apr 16 11:54:54 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 3 +++
.../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 4 ++++
.../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 5 +++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/071298c6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
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 81ee18a..690436b 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
@@ -402,6 +402,9 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
}
RedirectServlet.regionServerInfoPort = infoServer.getPort();
+ if(RedirectServlet.regionServerInfoPort == infoPort) {
+ return infoPort;
+ }
masterJettyServer = new org.mortbay.jetty.Server();
Connector connector = new SelectChannelConnector();
connector.setHost(addr);
http://git-wip-us.apache.org/repos/asf/hbase/blob/071298c6/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
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 2a2a82c..5054ca8 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,6 +1671,10 @@ public class HRegionServer extends HasThread implements
private int putUpWebUI() throws IOException {
int port = this.conf.getInt(HConstants.REGIONSERVER_INFO_PORT,
HConstants.DEFAULT_REGIONSERVER_INFOPORT);
+ if(this instanceof HMaster) {
+ port = conf.getInt(HConstants.MASTER_INFO_PORT,
+ HConstants.DEFAULT_MASTER_INFOPORT);
+ }
// -1 is for disabling info server
if (port < 0) return port;
String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0");
http://git-wip-us.apache.org/repos/asf/hbase/blob/071298c6/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
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 6da9ba1..07b98f3 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
@@ -84,6 +84,7 @@ import org.apache.hadoop.hbase.ipc.RpcServer.BlockingServiceAndInterface;
import org.apache.hadoop.hbase.ipc.RpcServerInterface;
import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
+import org.apache.hadoop.hbase.master.MasterRpcServices;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.RequestConverter;
import org.apache.hadoop.hbase.protobuf.ResponseConverter;
@@ -766,6 +767,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
String hostname = getHostname(rs.conf);
int port = rs.conf.getInt(HConstants.REGIONSERVER_PORT,
HConstants.DEFAULT_REGIONSERVER_PORT);
+ if(this instanceof MasterRpcServices) {
+ port = rs.conf.getInt(HConstants.MASTER_PORT,
+ HConstants.DEFAULT_REGIONSERVER_PORT);
+ }
// Creation of a HSA will force a resolve.
InetSocketAddress initialIsa = new InetSocketAddress(hostname, port);
InetSocketAddress bindAddress = new InetSocketAddress(