Repository: hbase Updated Branches: refs/heads/branch-1 007852254 -> 49359a4ee refs/heads/branch-1.1 e4ef86cbd -> cf0dd5d4f refs/heads/branch-1.2 d14803534 -> 98aa826b7 refs/heads/branch-1.3 d3d50338e -> 8566fd0f1 refs/heads/master 3bd9220f0 -> c1ada0a37
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/c1ada0a3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c1ada0a3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c1ada0a3 Branch: refs/heads/master Commit: c1ada0a373561132a3359b48a27975b2e85978da Parents: 3bd9220 Author: Enis Soztutar <[email protected]> Authored: Wed May 18 11:36:10 2016 -0700 Committer: Enis Soztutar <[email protected]> Committed: Wed May 18 11:36:10 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/c1ada0a3/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 8b16a5b..84367b0 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 @@ -144,9 +144,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"); @@ -450,4 +447,4 @@ public class LocalHBaseCluster { connection.close(); cluster.shutdown(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/c1ada0a3/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 002bdb2..f788bed 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 @@ -86,6 +86,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();
