From f17165ae08f9c3f832a171f50af43a51c568f308 Mon Sep 17 00:00:00 2001 From: Enis Soztutar Date: Wed, 6 Feb 2013 22:05:17 +0000 Subject: [PATCH] HBASE-7768. Zkcluster in local mode not seeing configurations in hbase-{site|default}.xml git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443234 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/master/HMasterCommandLine.java | 3 +-- .../java/org/apache/hadoop/hbase/PerformanceEvaluation.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java index 3f034d7bd26..370f9ac4f43 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java @@ -121,8 +121,7 @@ public class HMasterCommandLine extends ServerCommandLine { // If 'local', defer to LocalHBaseCluster instance. Starts master // and regionserver both in the one JVM. if (LocalHBaseCluster.isLocal(conf)) { - final MiniZooKeeperCluster zooKeeperCluster = - new MiniZooKeeperCluster(); + final MiniZooKeeperCluster zooKeeperCluster = new MiniZooKeeperCluster(conf); File zkDataPath = new File(conf.get(HConstants.ZOOKEEPER_DATA_DIR)); int zkClientPort = conf.getInt(HConstants.ZOOKEEPER_CLIENT_PORT, 0); if (zkClientPort == 0) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index faf7b9b7cb8..b4c4bb5ca5b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -1518,7 +1518,7 @@ public class PerformanceEvaluation extends Configured implements Tool { Configuration conf = getConf(); if (this.miniCluster) { dfsCluster = new MiniDFSCluster(conf, 2, true, (String[])null); - zooKeeperCluster = new MiniZooKeeperCluster(); + zooKeeperCluster = new MiniZooKeeperCluster(conf); int zooKeeperPort = zooKeeperCluster.startup(new File(System.getProperty("java.io.tmpdir"))); // mangle the conf so that the fs parameter points to the minidfs we