Repository: kylin Updated Branches: refs/heads/master 3e9bc5bd2 -> fb706854a
KYLIN-2626 Fix InstantiationException in ZookeeperDistributedJobLock Signed-off-by: shaofengshi <shaofeng...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fb706854 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fb706854 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fb706854 Branch: refs/heads/master Commit: fb706854ab7e0b03ad85ec85c83902bb83b36ae2 Parents: 3e9bc5b Author: kangkaisen <kangkai...@live.com> Authored: Wed May 17 12:15:18 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Wed Jan 3 18:06:09 2018 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ---- .../test/java/org/apache/kylin/common/KylinConfigTest.java | 6 ------ .../main/java/org/apache/kylin/rest/service/JobService.java | 9 ++------- 3 files changed, 2 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fb706854/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 667eea9..ef9b7ab 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 @@ -604,10 +604,6 @@ abstract public class KylinConfigBase implements Serializable { return Integer.parseInt(getOptional("kylin.job.sampling-hll-precision", "14")); } - public String getJobControllerLock() { - return getOptional("kylin.job.lock", "org.apache.kylin.storage.hbase.util.ZookeeperJobLock"); - } - public Map<Integer, String> getSchedulers() { Map<Integer, String> r = Maps.newLinkedHashMap(); r.put(0, "org.apache.kylin.job.impl.threadpool.DefaultScheduler"); http://git-wip-us.apache.org/repos/asf/kylin/blob/fb706854/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java b/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java index 6da854b..045ecb4 100644 --- a/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java @@ -32,12 +32,6 @@ import org.junit.Test; import com.google.common.collect.Maps; public class KylinConfigTest extends HotLoadKylinPropertiesTestCase { - @Test - public void testDuplicateConfig() { - KylinConfig config = KylinConfig.getInstanceFromEnv(); - String v = config.getJobControllerLock(); - assertEquals("org.apache.kylin.job.lock.MockJobLock", v); - } @Test public void testMRConfigOverride() { http://git-wip-us.apache.org/repos/asf/kylin/blob/fb706854/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java index cbbf711..e518837 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java @@ -33,7 +33,6 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.apache.directory.api.util.Strings; import org.apache.kylin.common.KylinConfig; -import org.apache.kylin.common.util.ClassUtil; import org.apache.kylin.common.util.Pair; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeManager; @@ -58,7 +57,6 @@ import org.apache.kylin.job.execution.CheckpointExecutable; import org.apache.kylin.job.execution.DefaultChainedExecutable; import org.apache.kylin.job.execution.ExecutableState; import org.apache.kylin.job.execution.Output; -import org.apache.kylin.job.lock.JobLock; import org.apache.kylin.metadata.model.SegmentRange; import org.apache.kylin.metadata.model.SegmentRange.TSRange; import org.apache.kylin.metadata.model.SegmentStatusEnum; @@ -71,6 +69,7 @@ import org.apache.kylin.rest.util.AclEvaluate; import org.apache.kylin.source.ISource; import org.apache.kylin.source.SourceFactory; import org.apache.kylin.source.SourcePartition; +import org.apache.kylin.storage.hbase.util.ZookeeperJobLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -97,8 +96,6 @@ public class JobService extends BasicService implements InitializingBean { private static final Logger logger = LoggerFactory.getLogger(JobService.class); - private JobLock jobLock; - @Autowired @Qualifier("accessService") private AccessService accessService; @@ -124,13 +121,11 @@ public class JobService extends BasicService implements InitializingBean { final Scheduler<AbstractExecutable> scheduler = (Scheduler<AbstractExecutable>) SchedulerFactory .scheduler(kylinConfig.getSchedulerType()); - jobLock = (JobLock) ClassUtil.newInstance(kylinConfig.getJobControllerLock()); - new Thread(new Runnable() { @Override public void run() { try { - scheduler.init(new JobEngineConfig(kylinConfig), jobLock); + scheduler.init(new JobEngineConfig(kylinConfig), new ZookeeperJobLock()); if (!scheduler.hasStarted()) { logger.info("scheduler has not been started"); }
