Repository: kylin Updated Branches: refs/heads/master 8263752a4 -> d135bdb0e
minor, use local metadata to avoid conflict when running concurrently Signed-off-by: lidongsjtu <lid...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d135bdb0 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d135bdb0 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d135bdb0 Branch: refs/heads/master Commit: d135bdb0eed6118245a606fb0bca996420dee70f Parents: 8263752 Author: etherge <ethe...@163.com> Authored: Wed Feb 8 18:40:07 2017 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Wed Feb 8 18:54:06 2017 +0800 ---------------------------------------------------------------------- kylin-it/pom.xml | 3 +++ .../kylin/job/BaseTestDistributedScheduler.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/d135bdb0/kylin-it/pom.xml ---------------------------------------------------------------------- diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index 91104ba..d58a895 100644 --- a/kylin-it/pom.xml +++ b/kylin-it/pom.xml @@ -36,6 +36,7 @@ <properties> <hdp.version/> <fastBuildMode/> + <buildCubeUsingProvidedData/> <engineType/> </properties> @@ -316,6 +317,7 @@ <arguments> <argument>-Dhdp.version=${hdp.version}</argument> <argument>-DfastBuildMode=${fastBuildMode}</argument> + <argument>-DbuildCubeUsingProvidedData=${buildCubeUsingProvidedData}</argument> <argument>-DengineType=${engineType}</argument> <argument>-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</argument> <argument>-classpath</argument> @@ -338,6 +340,7 @@ <arguments> <argument>-Dhdp.version=${hdp.version}</argument> <argument>-DfastBuildMode=${fastBuildMode}</argument> + <argument>-DbuildCubeUsingProvidedData=${buildCubeUsingProvidedData}</argument> <argument>-Dlog4j.configuration=file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</argument> <argument>-classpath</argument> <classpath/> http://git-wip-us.apache.org/repos/asf/kylin/blob/d135bdb0/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java b/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java index 1a0a39d..2f37a50 100644 --- a/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java +++ b/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java @@ -24,6 +24,7 @@ import java.util.Arrays; import javax.annotation.Nullable; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; @@ -48,6 +49,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Function; import com.google.common.collect.Iterables; +import com.google.common.io.Files; public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { static ExecutableManager execMgr; @@ -57,13 +59,13 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { static KylinConfig kylinConfig1; static KylinConfig kylinConfig2; static CuratorFramework zkClient; + static File localMetaDir; static final String SEGMENT_ID = "segmentId"; static final String segmentId1 = "segmentId1"; static final String segmentId2 = "segmentId2"; static final String serverName1 = "serverName1"; static final String serverName2 = "serverName2"; - static final String confSrcPath = "../examples/test_case_data/sandbox/kylin.properties"; static final String confDstPath1 = "target/kylin_metadata_dist_lock_test1/kylin.properties"; static final String confDstPath2 = "target/kylin_metadata_dist_lock_test2/kylin.properties"; @@ -77,14 +79,17 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { new File(confDstPath1).getParentFile().mkdirs(); new File(confDstPath2).getParentFile().mkdirs(); KylinConfig srcConfig = KylinConfig.getInstanceFromEnv(); + + localMetaDir = Files.createTempDir(); String backup = srcConfig.getMetadataUrl(); - srcConfig.setProperty("kylin.metadata.url", "kylin_metadata_dist_lock_test@hbase"); + srcConfig.setProperty("kylin.metadata.url", localMetaDir.getAbsolutePath()); srcConfig.writeProperties(new File(confDstPath1)); srcConfig.writeProperties(new File(confDstPath2)); srcConfig.setProperty("kylin.metadata.url", backup); + kylinConfig1 = KylinConfig.createInstanceFromUri(new File(confDstPath1).getAbsolutePath()); kylinConfig2 = KylinConfig.createInstanceFromUri(new File(confDstPath2).getAbsolutePath()); - + initZk(); if (jobLock == null) @@ -130,7 +135,8 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { zkClient.close(); zkClient = null; } - + + FileUtils.deleteDirectory(localMetaDir); System.clearProperty("kylin.job.lock"); staticCleanupTestMetadata(); }
