Repository: kylin Updated Branches: refs/heads/master 04d6f2a26 -> 023b5cb1d
stop scheduler on test finish Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/023b5cb1 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/023b5cb1 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/023b5cb1 Branch: refs/heads/master Commit: 023b5cb1dfdacfa9adcc2586b4aaeb3886f61098 Parents: 04d6f2a Author: shaofengshi <shaofeng...@apache.org> Authored: Fri Sep 16 22:53:10 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Fri Sep 16 22:53:10 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/job/impl/threadpool/BaseSchedulerTest.java | 1 + .../java/org/apache/kylin/provision/BuildCubeWithEngine.java | 6 ++++++ .../java/org/apache/kylin/provision/BuildCubeWithStream.java | 2 ++ .../java/org/apache/kylin/provision/BuildCubeWithStream2.java | 1 + 4 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/023b5cb1/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java ---------------------------------------------------------------------- diff --git a/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java b/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java index 4e092a1..97c9f8d 100644 --- a/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java +++ b/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/BaseSchedulerTest.java @@ -55,6 +55,7 @@ public abstract class BaseSchedulerTest extends LocalFileMetadataTestCase { @After public void after() throws Exception { + DefaultScheduler.destroyInstance(); cleanupTestMetadata(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/023b5cb1/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java index 3d60a3c..31cf0eb 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java @@ -79,6 +79,7 @@ public class BuildCubeWithEngine { BuildCubeWithEngine buildCubeWithEngine = new BuildCubeWithEngine(); buildCubeWithEngine.before(); buildCubeWithEngine.build(); + buildCubeWithEngine.after(); logger.info("Build is done"); afterClass(); logger.info("Going to exit"); @@ -148,6 +149,11 @@ public class BuildCubeWithEngine { } + + public void after(){ + DefaultScheduler.destroyInstance(); + } + public static void afterClass() { HBaseMetadataTestCase.staticCleanupTestMetadata(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/023b5cb1/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java index 53c9dce..0d63ba4 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java @@ -33,6 +33,7 @@ import org.apache.kylin.engine.streaming.StreamingConfig; import org.apache.kylin.engine.streaming.StreamingManager; import org.apache.kylin.job.DeployUtil; import org.apache.kylin.job.engine.JobEngineConfig; +import org.apache.kylin.job.exception.SchedulerException; import org.apache.kylin.job.execution.AbstractExecutable; import org.apache.kylin.job.execution.DefaultChainedExecutable; import org.apache.kylin.job.execution.ExecutableState; @@ -218,6 +219,7 @@ public class BuildCubeWithStream { public void after(){ kafkaServer.stop(); + DefaultScheduler.destroyInstance(); } protected void waitForJob(String jobId) { http://git-wip-us.apache.org/repos/asf/kylin/blob/023b5cb1/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream2.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream2.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream2.java index d48a473..2812446 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream2.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream2.java @@ -235,6 +235,7 @@ public class BuildCubeWithStream2 { public void after() { kafkaServer.stop(); + DefaultScheduler.destroyInstance(); } protected void waitForJob(String jobId) {