hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [3/3] hbase git commit: HBASE-15824 LocalHBaseCluster gets bind exception in master info port
Date Mon, 16 May 2016 17:39:13 GMT
HBASE-15824 LocalHBaseCluster gets bind exception in master info port


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cbcc8c34
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cbcc8c34
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cbcc8c34

Branch: refs/heads/branch-1.3
Commit: cbcc8c34b9f3d9ce82dd96f5809b705c752b4fc3
Parents: 89276ae
Author: Enis Soztutar <enis@apache.org>
Authored: Sun May 15 23:02:11 2016 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Mon May 16 10:37:11 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java    | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cbcc8c34/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
index 7da8e68..da38775 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
@@ -143,6 +143,9 @@ public class LocalHBaseCluster {
     // Always have masters and regionservers come up on port '0' so we don't
     // clash over default ports.
     conf.set(HConstants.MASTER_PORT, "0");
+    if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {
+      conf.set(HConstants.MASTER_INFO_PORT, "0");
+    }
     conf.set(HConstants.REGIONSERVER_PORT, "0");
     if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) {
       conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");
@@ -195,6 +198,7 @@ public class LocalHBaseCluster {
   throws IOException, InterruptedException {
     return user.runAs(
         new PrivilegedExceptionAction<JVMClusterUtil.RegionServerThread>() {
+          @Override
           public JVMClusterUtil.RegionServerThread run() throws Exception {
             return addRegionServer(config, index);
           }
@@ -227,6 +231,7 @@ public class LocalHBaseCluster {
   throws IOException, InterruptedException {
     return user.runAs(
         new PrivilegedExceptionAction<JVMClusterUtil.MasterThread>() {
+          @Override
           public JVMClusterUtil.MasterThread run() throws Exception {
             return addMaster(c, index);
           }


Mime
View raw message