Repository: kylin Updated Branches: refs/heads/master 79a7b47d3 -> cf48410dd
make the cleanup time configurable Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/cf48410d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/cf48410d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/cf48410d Branch: refs/heads/master Commit: cf48410dd4eac9a94d69557e5c6c364a5bcd3035 Parents: 79a7b47 Author: shaofengshi <shaofeng...@apache.org> Authored: Tue May 31 10:38:00 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Tue May 31 10:38:00 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++++ examples/test_case_data/sandbox/kylin.properties | 3 +-- .../org/apache/kylin/storage/hbase/util/StorageCleanupJob.java | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/cf48410d/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index f3edc01..a75688b 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -758,4 +758,8 @@ abstract public class KylinConfigBase implements Serializable { public String getHBaseMaxConnectionThreads() { return getOptional("kylin.query.hbase.hconnection.threads.max", "3072"); } + + public long getStorageCleanupTimeThreshold() { + return Long.valueOf(this.getOptional("kylin.storage.cleanup.time.threshold", "172800000"));//default two days + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/cf48410d/examples/test_case_data/sandbox/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index 423d7de..3751fe2 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -84,9 +84,8 @@ kylin.hbase.default.compression.codec=gzip # 'auto', 'inmem', 'layer' or 'random' for testing kylin.cube.algorithm=random - kylin.security.profile=testing - +kylin.storage.cleanup.time.threshold=21600000 ## Config for Restful APP ## # database connection settings: http://git-wip-us.apache.org/repos/asf/kylin/blob/cf48410d/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java index c010d51..0bb8380 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java @@ -62,8 +62,6 @@ public class StorageCleanupJob extends AbstractHadoopJob { protected static final Logger logger = LoggerFactory.getLogger(StorageCleanupJob.class); - public static final long TIME_THREADSHOLD = 2 * 24 * 3600 * 1000l; // 2 days - boolean delete = false; protected static ExecutableManager executableManager = ExecutableManager.getInstance(KylinConfig.getInstanceFromEnv()); @@ -102,7 +100,7 @@ public class StorageCleanupJob extends AbstractHadoopJob { private void cleanUnusedHBaseTables(Configuration conf) throws IOException { CubeManager cubeMgr = CubeManager.getInstance(KylinConfig.getInstanceFromEnv()); IIManager iiManager = IIManager.getInstance(KylinConfig.getInstanceFromEnv()); - + long TIME_THREADSHOLD = KylinConfig.getInstanceFromEnv().getStorageCleanupTimeThreshold(); // get all kylin hbase tables HBaseAdmin hbaseAdmin = new HBaseAdmin(conf); String tableNamePrefix = IRealizationConstants.SharedHbaseStorageLocationPrefix;
