Repository: kylin Updated Branches: refs/heads/master ed643e6b2 -> 7847f51ca
KYLIN-1726 minor update in kylin.sh Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7847f51c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7847f51c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7847f51c Branch: refs/heads/master Commit: 7847f51cac4d8fe2be494ed20bc3616a17ad8757 Parents: ed643e6 Author: shaofengshi <shaofeng...@apache.org> Authored: Mon Oct 10 15:19:09 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Mon Oct 10 15:19:09 2016 +0800 ---------------------------------------------------------------------- build/bin/kylin.sh | 2 +- .../apache/kylin/provision/BuildCubeWithStream.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7847f51c/build/bin/kylin.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh index 039be9f..da53d3d 100644 --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -40,7 +40,7 @@ function retrieveDependency() { export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX} export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency} - #export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}:${kafka_dependency} + #export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${kafka_dependency} } # start command http://git-wip-us.apache.org/repos/asf/kylin/blob/7847f51c/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 a47fcde..65dd151 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 @@ -276,11 +276,6 @@ public class BuildCubeWithStream { HBaseMetadataTestCase.staticCreateTestMetadata(HBaseMetadataTestCase.SANDBOX_TEST_DATA); } - public static void afterClass() throws Exception { - cleanupOldStorage(); - HBaseMetadataTestCase.staticCleanupTestMetadata(); - } - public void after() { kafkaServer.stop(); DefaultScheduler.destroyInstance(); @@ -301,6 +296,11 @@ public class BuildCubeWithStream { } } + public void cleanup() throws Exception { + cleanupOldStorage(); + HBaseMetadataTestCase.staticCleanupTestMetadata(); + } + private static void cleanupOldStorage() throws Exception { String[] args = { "--delete", "true" }; StorageCleanupJob cli = new StorageCleanupJob(); @@ -314,16 +314,15 @@ public class BuildCubeWithStream { buildCubeWithStream = new BuildCubeWithStream(); buildCubeWithStream.before(); buildCubeWithStream.build(); + logger.info("Build is done"); + buildCubeWithStream.cleanup(); logger.info("Going to exit"); - System.exit(0); } catch (Throwable e) { logger.error("error", e); - System.exit(1); } finally { if (buildCubeWithStream != null) { buildCubeWithStream.after(); } - afterClass(); } }
