Repository: kylin Updated Branches: refs/heads/1.5.x-CDH5.7 012b80f6f -> beded5e2c (forced update)
Revert "stop scheduler on test finish" This reverts commit 023b5cb1dfdacfa9adcc2586b4aaeb3886f61098. Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e604f652 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e604f652 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e604f652 Branch: refs/heads/1.5.x-CDH5.7 Commit: e604f6527d60b767f8a46a576765cfd205b1efc5 Parents: 8e9c455 Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Sep 19 23:49:28 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue Sep 20 11:43:08 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 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e604f652/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 97c9f8d..4e092a1 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,7 +55,6 @@ 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/e604f652/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 31cf0eb..3d60a3c 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,7 +79,6 @@ public class BuildCubeWithEngine { BuildCubeWithEngine buildCubeWithEngine = new BuildCubeWithEngine(); buildCubeWithEngine.before(); buildCubeWithEngine.build(); - buildCubeWithEngine.after(); logger.info("Build is done"); afterClass(); logger.info("Going to exit"); @@ -149,11 +148,6 @@ public class BuildCubeWithEngine { } - - public void after(){ - DefaultScheduler.destroyInstance(); - } - public static void afterClass() { HBaseMetadataTestCase.staticCleanupTestMetadata(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/e604f652/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 6e5313f..b7c609e 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,7 +217,6 @@ 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/e604f652/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 2812446..d48a473 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,7 +235,6 @@ public class BuildCubeWithStream2 { public void after() { kafkaServer.stop(); - DefaultScheduler.destroyInstance(); } protected void waitForJob(String jobId) {
