hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [5/5] hbase git commit: HBASE-15824 LocalHBaseCluster gets bind exception in master info port - ADDENDUM
Date Wed, 18 May 2016 18:56:52 GMT
HBASE-15824 LocalHBaseCluster gets bind exception in master info port - ADDENDUM


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

Branch: refs/heads/branch-1.1
Commit: cf0dd5d4fe292a1a21b6103e4dca901d1e9009c3
Parents: e4ef86c
Author: Enis Soztutar <enis@apache.org>
Authored: Wed May 18 11:36:10 2016 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Wed May 18 11:40:37 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java    | 5 +----
 .../src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cf0dd5d4/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 e60f868..f70f73f 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,9 +143,6 @@ 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");
@@ -487,4 +484,4 @@ public class LocalHBaseCluster {
     }
     cluster.shutdown();
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/cf0dd5d4/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
index a3154d4..42f83ca 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
@@ -87,6 +87,9 @@ public class MiniHBaseCluster extends HBaseCluster {
       throws IOException, InterruptedException {
     super(conf);
     conf.set(HConstants.MASTER_PORT, "0");
+    if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {
+      conf.set(HConstants.MASTER_INFO_PORT, "0");
+    }
 
     // Hadoop 2
     CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();


Mime
View raw message