Repository: kylin Updated Branches: refs/heads/2846 a185a2342 -> f374d6caa
KYLIN-2846 use configured hbase namespace in StorageCleanJobHbaseUtil Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f374d6ca Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f374d6ca Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f374d6ca Branch: refs/heads/2846 Commit: f374d6caae1b42ff41661917d4db5b6145303c38 Parents: a185a23 Author: zeng.yaowu <513797...@qq.com> Authored: Sat Oct 21 23:05:17 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Oct 21 23:07:01 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/job/StorageCleanJobHbaseUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/f374d6ca/server-base/src/main/java/org/apache/kylin/rest/job/StorageCleanJobHbaseUtil.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/job/StorageCleanJobHbaseUtil.java b/server-base/src/main/java/org/apache/kylin/rest/job/StorageCleanJobHbaseUtil.java index aceebb4..9933fb4 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/job/StorageCleanJobHbaseUtil.java +++ b/server-base/src/main/java/org/apache/kylin/rest/job/StorageCleanJobHbaseUtil.java @@ -50,7 +50,9 @@ public class StorageCleanJobHbaseUtil { CubeManager cubeMgr = CubeManager.getInstance(kylinConfig); // get all kylin hbase tables try (HBaseAdmin hbaseAdmin = new HBaseAdmin(conf)) { - String tableNamePrefix = kylinConfig.getHBaseTableNamePrefix(); + String namespace = kylinConfig.getHBaseStorageNameSpace(); + String tableNamePrefix = (namespace.equals("default") || namespace.equals("")) + ? kylinConfig.getHBaseTableNamePrefix() : (namespace + ":" + kylinConfig.getHBaseTableNamePrefix()); HTableDescriptor[] tableDescriptors = hbaseAdmin.listTables(tableNamePrefix + ".*"); List<String> allTablesNeedToBeDropped = new ArrayList<String>(); for (HTableDescriptor desc : tableDescriptors) {
