Repository: kylin Updated Branches: refs/heads/master 562934112 -> a2a59c430
KYLIN-2374 minor,rename zookeeper config properties Signed-off-by: Hongbin Ma <mahong...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a2a59c43 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a2a59c43 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a2a59c43 Branch: refs/heads/master Commit: a2a59c4303a29de308beb7b5c8300f78023313dd Parents: 5629341 Author: xiefan46 <958034...@qq.com> Authored: Tue Jan 24 18:57:07 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Wed Jan 25 14:21:37 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++-- examples/test_case_data/sandbox/kylin.properties | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/a2a59c43/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 07cb124..5932197 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -930,11 +930,11 @@ abstract public class KylinConfigBase implements Serializable { //zoo keeper public String getZooKeeperHost() { - return getOptional("kylin.storage-zookeeper.host", "localhost"); + return getOptional("kylin.storage.lock-manager-zk-host", "localhost"); } public String getZooKeeperPort() { - return getOptional("kylin.storage-zookeeper.port", "2181"); + return getOptional("kylin.storage.lock-manager-zk-port", "2181"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/a2a59c43/examples/test_case_data/sandbox/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index fa0c6bc..6cb5148 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -55,6 +55,9 @@ kylin.env.hdfs-working-dir=/kylin kylin.engine.mr.reduce-input-mb=500 +#zoo keeper host in lock manager +kylin.storage.lock-manager-zk-host=sandbox + ### JOB ### # max job retry on error, default 0: no retry @@ -179,5 +182,3 @@ kylin.engine.spark-conf.spark.eventLog.dir=hdfs\:///kylin/spark-history #kylin.engine.spark-conf.spark.io.compression.codec=org.apache.spark.io.SnappyCompressionCodec -#zoo keeper -kylin.storage-zookeeper.host=sandbox \ No newline at end of file
