Repository: kylin Updated Branches: refs/heads/master 14058bda8 -> 520f6279c
KYLIN-2819 add configurable zookeeper base path Signed-off-by: Li Yang <liy...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/520f6279 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/520f6279 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/520f6279 Branch: refs/heads/master Commit: 520f6279c560f457c1b7fe1173532959fcee5c6c Parents: 14058bd Author: shenyinjie <shenyin...@cmss.chinamobile.com> Authored: Sun Sep 3 17:36:02 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Sun Sep 3 20:46:58 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++++ core-common/src/main/resources/kylin-defaults.properties | 2 ++ .../apache/kylin/job/impl/threadpool/DistributedScheduler.java | 2 +- .../kylin/storage/hbase/util/ZookeeperDistributedLock.java | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/520f6279/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 9533400..749b515 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 @@ -226,6 +226,10 @@ abstract public class KylinConfigBase implements Serializable { return cachedHdfsWorkingDirectory; } + public String getZookeeperBasePath() { + return getOptional("kylin.env.zookeeper-base-path", "/kylin"); + } + /** * A comma separated list of host:port pairs, each corresponding to a ZooKeeper server */ http://git-wip-us.apache.org/repos/asf/kylin/blob/520f6279/core-common/src/main/resources/kylin-defaults.properties ---------------------------------------------------------------------- diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties index f0328fa..a3277ce 100644 --- a/core-common/src/main/resources/kylin-defaults.properties +++ b/core-common/src/main/resources/kylin-defaults.properties @@ -26,6 +26,8 @@ kylin.env.hdfs-working-dir=/kylin # DEV|QA|PROD. DEV will turn on some dev features, QA and PROD has no difference in terms of functions. kylin.env=QA +# kylin zk base path +kylin.env.zookeeper-base-path=/kylin ### SERVER | WEB ### http://git-wip-us.apache.org/repos/asf/kylin/blob/520f6279/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DistributedScheduler.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DistributedScheduler.java b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DistributedScheduler.java index e3a5836..6d41c5e 100644 --- a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DistributedScheduler.java +++ b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DistributedScheduler.java @@ -82,7 +82,7 @@ public class DistributedScheduler implements Scheduler<AbstractExecutable>, Conn private String serverName; private final static String SEGMENT_ID = "segmentId"; - public static final String ZOOKEEPER_LOCK_PATH = "/job_engine/lock"; // note ZookeeperDistributedLock will ensure zk path prefix: /kylin/metadata + public static final String ZOOKEEPER_LOCK_PATH = "/job_engine/lock"; // note ZookeeperDistributedLock will ensure zk path prefix: /${kylin.env.zookeeper-base-path}/metadata //only for it test public static DistributedScheduler getInstance(KylinConfig config) { http://git-wip-us.apache.org/repos/asf/kylin/blob/520f6279/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java index 63ffda0..844d9ed 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java @@ -102,7 +102,7 @@ public class ZookeeperDistributedLock implements DistributedLock, JobLock { public Factory(KylinConfig config) { this.curator = getZKClient(config); - this.zkPathBase = fixSlash("/kylin/" + KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix()); + this.zkPathBase = fixSlash(config.getZookeeperBasePath() + "/" + config.getMetadataUrlPrefix()); } @Override
