KYLIN-2006 minor revision
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3aad93a5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3aad93a5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3aad93a5 Branch: refs/heads/KYLIN-2006 Commit: 3aad93a5d1c5dac30b25d45d72ee175948220be9 Parents: 7fe4317 Author: Yang Li <liy...@apache.org> Authored: Mon Nov 7 20:59:25 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Tue Nov 8 23:23:35 2016 +0800 ---------------------------------------------------------------------- .../impl/threadpool/DistributedScheduler.java | 3 +-- .../kylin/job/lock/DistributedJobLock.java | 7 +++++- .../org/apache/kylin/job/lock/DoWatchLock.java | 23 -------------------- .../hbase/util/ZookeeperDistributedJobLock.java | 1 - 4 files changed, 7 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3aad93a5/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 11709c7..17df119 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 @@ -46,7 +46,6 @@ import org.apache.kylin.job.execution.Executable; import org.apache.kylin.job.execution.ExecutableState; import org.apache.kylin.job.execution.Output; import org.apache.kylin.job.lock.DistributedJobLock; -import org.apache.kylin.job.lock.DoWatchLock; import org.apache.kylin.job.lock.JobLock; import org.apache.kylin.job.manager.ExecutableManager; import org.slf4j.Logger; @@ -209,7 +208,7 @@ public class DistributedScheduler implements Scheduler<AbstractExecutable>, Conn } //when the segment lock released but the segment related job still running, resume the job. - private class DoWatchImpl implements DoWatchLock { + private class DoWatchImpl implements org.apache.kylin.job.lock.DistributedJobLock.DoWatchLock { private String serverName; public DoWatchImpl(String serverName) { http://git-wip-us.apache.org/repos/asf/kylin/blob/3aad93a5/core-job/src/main/java/org/apache/kylin/job/lock/DistributedJobLock.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/lock/DistributedJobLock.java b/core-job/src/main/java/org/apache/kylin/job/lock/DistributedJobLock.java index 5ba8426..9335e56 100644 --- a/core-job/src/main/java/org/apache/kylin/job/lock/DistributedJobLock.java +++ b/core-job/src/main/java/org/apache/kylin/job/lock/DistributedJobLock.java @@ -21,9 +21,14 @@ package org.apache.kylin.job.lock; import java.util.concurrent.ExecutorService; public interface DistributedJobLock extends JobLock { - boolean lockWithName(String cubeName, String serverName); + + boolean lockWithName(String name, String serverName); void unlockWithName(String name); void watchLock(ExecutorService pool, DoWatchLock doWatch); + + public interface DoWatchLock { + void doWatch(String path, String data); + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/3aad93a5/core-job/src/main/java/org/apache/kylin/job/lock/DoWatchLock.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/lock/DoWatchLock.java b/core-job/src/main/java/org/apache/kylin/job/lock/DoWatchLock.java deleted file mode 100644 index 08c13f9..0000000 --- a/core-job/src/main/java/org/apache/kylin/job/lock/DoWatchLock.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.apache.kylin.job.lock; - -public interface DoWatchLock { - void doWatch(String path, String data); -} http://git-wip-us.apache.org/repos/asf/kylin/blob/3aad93a5/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java index eba7a20..d8d27c5 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java @@ -37,7 +37,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.job.lock.DistributedJobLock; -import org.apache.kylin.job.lock.DoWatchLock; import org.apache.kylin.storage.hbase.HBaseConnection; import org.apache.zookeeper.CreateMode; import org.slf4j.Logger;
