You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by qh...@apache.org on 2015/07/07 11:31:35 UTC
incubator-kylin git commit: KYLIN-880
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging f2b920614 -> 340a175d4
KYLIN-880
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/340a175d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/340a175d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/340a175d
Branch: refs/heads/0.7-staging
Commit: 340a175d4b5a65276534261c9ea7b53407ba9086
Parents: f2b9206
Author: qianhao.zhou <qi...@ebay.com>
Authored: Tue Jul 7 17:30:49 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Tue Jul 7 17:30:49 2015 +0800
----------------------------------------------------------------------
common/src/main/java/org/apache/kylin/common/KylinConfig.java | 6 +++++-
conf/kylin.properties | 4 ++--
examples/test_case_data/localmeta/kylin.properties | 4 ++--
examples/test_case_data/localmeta_v1/kylin.properties | 4 ++--
examples/test_case_data/minicluster/b-kylin/kylin.properties | 4 ++--
.../test_case_data/minicluster/b-kylin/meta/kylin.properties | 4 ++--
examples/test_case_data/minicluster/kylin.properties | 4 ++--
examples/test_case_data/sandbox-hdp21/kylin.properties | 4 ++--
examples/test_case_data/sandbox/kylin.properties | 4 ++--
9 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/common/src/main/java/org/apache/kylin/common/KylinConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/KylinConfig.java b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 5ae18a6..aa2f224 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -279,7 +279,11 @@ public class KylinConfig {
}
public String getHdfsWorkingDirectory() {
- return getRequired(KYLIN_HDFS_WORKING_DIR);
+ String root = getRequired(KYLIN_HDFS_WORKING_DIR);
+ if (!root.endsWith("/")) {
+ root += "/";
+ }
+ return root + getMetadataUrlPrefix();
}
public String getKylinJobLogDir() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
index b1ebccc..aa232bb 100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=kylin_metadata@hbase
# The storage for final cube file in hbase
kylin.storage.url=hbase
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/examples/test_case_data/localmeta/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties
index bf51be7..ff9ece4 100644
--- a/examples/test_case_data/localmeta/kylin.properties
+++ b/examples/test_case_data/localmeta/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=
# The storage for final cube file in hbase
kylin.storage.url=hbase:sandbox.hortonworks.com:2181:/hbase-unsecure
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/examples/test_case_data/localmeta_v1/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta_v1/kylin.properties b/examples/test_case_data/localmeta_v1/kylin.properties
index bf51be7..ff9ece4 100644
--- a/examples/test_case_data/localmeta_v1/kylin.properties
+++ b/examples/test_case_data/localmeta_v1/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=
# The storage for final cube file in hbase
kylin.storage.url=hbase:sandbox.hortonworks.com:2181:/hbase-unsecure
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/examples/test_case_data/minicluster/b-kylin/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/minicluster/b-kylin/kylin.properties b/examples/test_case_data/minicluster/b-kylin/kylin.properties
index e2fe45c..38587f2 100644
--- a/examples/test_case_data/minicluster/b-kylin/kylin.properties
+++ b/examples/test_case_data/minicluster/b-kylin/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=kylin_metadata@hbase:sandbox.hortonworks.com:2181:/hbase-unse
# The storage for final cube file in hbase
kylin.storage.url=hbase:sandbox.hortonworks.com:2181:/hbase-unsecure
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties b/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties
index 6e2e951..5d890de 100644
--- a/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties
+++ b/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=kylin_metadata@hbase:sandbox.hortonworks.com:2181:/hbase-unse
# The storage for final cube file in hbase
kylin.storage.url=hbase:sandbox.hortonworks.com:2181:/hbase-unsecure
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/examples/test_case_data/minicluster/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/minicluster/kylin.properties b/examples/test_case_data/minicluster/kylin.properties
index aa53158..e81b8d5 100644
--- a/examples/test_case_data/minicluster/kylin.properties
+++ b/examples/test_case_data/minicluster/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=kylin_metadata@hbase:minicluster:/hbase-unsecure
# The storage for final cube file in hbase
kylin.storage.url=hbase:minicluster:/hbase-unsecure
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/examples/test_case_data/sandbox-hdp21/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox-hdp21/kylin.properties b/examples/test_case_data/sandbox-hdp21/kylin.properties
index 04fa829..bb1719e 100644
--- a/examples/test_case_data/sandbox-hdp21/kylin.properties
+++ b/examples/test_case_data/sandbox-hdp21/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=kylin_metadata_qa@hbase:sandbox.hortonworks.com:2181:/hbase-u
# The storage for final cube file in hbase
kylin.storage.url=hbase:sandbox.hortonworks.com:2181:/hbase-unsecure
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/340a175d/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 8f73f64..caacb6e 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -26,8 +26,8 @@ kylin.metadata.url=kylin_metadata@hbase
# The storage for final cube file in hbase
kylin.storage.url=hbase
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
+# Temp folder in hdfs, make sure user has the right access to the hdfs directory
+kylin.hdfs.working.dir=/kylin
kylin.job.mapreduce.default.reduce.input.mb=500