You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/08/18 23:33:00 UTC
kylin git commit: KYLIN-1910 Add a little comment
Repository: kylin
Updated Branches:
refs/heads/master af2a82714 -> 56ec9d2d8
KYLIN-1910 Add a little comment
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/56ec9d2d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/56ec9d2d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/56ec9d2d
Branch: refs/heads/master
Commit: 56ec9d2d823c147432968c28cb223b3cb7fe6a53
Parents: af2a827
Author: Yang Li <li...@apache.org>
Authored: Fri Aug 19 07:32:45 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Fri Aug 19 07:32:45 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/storage/hbase/HBaseConnection.java | 6 +++---
.../org/apache/kylin/storage/hbase/steps/CubeHFileJob.java | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/56ec9d2d/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
index e93c2bd..cbf81b6 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
@@ -141,12 +141,12 @@ public class HBaseConnection {
}
private static Configuration newHBaseConfiguration(String url) {
- Configuration conf = HBaseConfiguration.create(HadoopUtil.getCurrentConfiguration());
- addHBaseClusterNNHAConfiguration(conf);
-
// using a hbase:xxx URL is deprecated, instead hbase config is always loaded from hbase-site.xml in classpath
if (!(StringUtils.isEmpty(url) || "hbase".equals(url)))
throw new IllegalArgumentException("to use hbase storage, pls set 'kylin.storage.url=hbase' in kylin.properties");
+
+ Configuration conf = HBaseConfiguration.create(HadoopUtil.getCurrentConfiguration());
+ addHBaseClusterNNHAConfiguration(conf);
// support hbase using a different FS
String hbaseClusterFs = KylinConfig.getInstanceFromEnv().getHBaseClusterFs();
http://git-wip-us.apache.org/repos/asf/kylin/blob/56ec9d2d/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
index 9145cef..666b841 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
@@ -76,6 +76,7 @@ public class CubeHFileJob extends AbstractHadoopJob {
job = Job.getInstance(getConf(), getOptionValue(OPTION_JOB_NAME));
setJobClasspath(job, cube.getConfig());
+ // For separate HBase cluster, note the output is a qualified HDFS path if "kylin.hbase.cluster.fs" is configured, ref HBaseMRSteps.getHFilePath()
HBaseConnection.addHBaseClusterNNHAConfiguration(job.getConfiguration());
addInputDirs(getOptionValue(OPTION_INPUT_PATH), job);