Revert "Revert "stop scheduler on test finish"" This reverts commit e604f6527d60b767f8a46a576765cfd205b1efc5.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8cbffb40 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8cbffb40 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8cbffb40 Branch: refs/heads/master Commit: 8cbffb40477611aa9c06bc5c22787aef83bc28d3 Parents: b1a0f4d Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Sep 24 14:58:26 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Tue Sep 27 10:17:40 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 | 1 + .../java/org/apache/kylin/provision/BuildCubeWithStream2.java | 1 + 4 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8cbffb40/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/8cbffb40/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/8cbffb40/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 b7c609e..6e5313f 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 @@ -217,6 +217,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/8cbffb40/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) {
