kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qhz...@apache.org
Subject incubator-kylin git commit: KYLIN-880
Date Tue, 07 Jul 2015 09:47:37 GMT
Repository: incubator-kylin
Updated Branches:
  refs/heads/0.8 9d575021a -> d30956170


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/d3095617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d3095617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d3095617

Branch: refs/heads/0.8
Commit: d30956170096f421e049aa1c7986389ee2556992
Parents: 9d57502
Author: qianhao.zhou <qianzhou@ebay.com>
Authored: Tue Jul 7 17:47:29 2015 +0800
Committer: qianhao.zhou <qianzhou@ebay.com>
Committed: Tue Jul 7 17:47:29 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-hdp220/kylin.properties        | 4 ++--
 examples/test_case_data/sandbox/kylin.properties               | 4 ++--
 10 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d3095617/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 69e4dcc..fd0a7d9 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -284,7 +284,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/d3095617/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
index 31e8356..e55f49d 100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
@@ -9,8 +9,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/d3095617/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 aa18287..f9bf878 100644
--- a/examples/test_case_data/localmeta/kylin.properties
+++ b/examples/test_case_data/localmeta/kylin.properties
@@ -9,8 +9,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/d3095617/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 aa18287..f9bf878 100644
--- a/examples/test_case_data/localmeta_v1/kylin.properties
+++ b/examples/test_case_data/localmeta_v1/kylin.properties
@@ -9,8 +9,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/d3095617/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 f1234a8..968ee6a 100644
--- a/examples/test_case_data/minicluster/b-kylin/kylin.properties
+++ b/examples/test_case_data/minicluster/b-kylin/kylin.properties
@@ -9,8 +9,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/d3095617/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 642f845..6caf9cc 100644
--- a/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties
+++ b/examples/test_case_data/minicluster/b-kylin/meta/kylin.properties
@@ -9,8 +9,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/d3095617/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 736de65..3b0033b 100644
--- a/examples/test_case_data/minicluster/kylin.properties
+++ b/examples/test_case_data/minicluster/kylin.properties
@@ -9,8 +9,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/d3095617/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 3e2f97a..1a90637 100644
--- a/examples/test_case_data/sandbox-hdp21/kylin.properties
+++ b/examples/test_case_data/sandbox-hdp21/kylin.properties
@@ -9,8 +9,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/d3095617/examples/test_case_data/sandbox-hdp220/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox-hdp220/kylin.properties b/examples/test_case_data/sandbox-hdp220/kylin.properties
index f211137..6ab0cef 100644
--- a/examples/test_case_data/sandbox-hdp220/kylin.properties
+++ b/examples/test_case_data/sandbox-hdp220/kylin.properties
@@ -9,8 +9,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/d3095617/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 f211137..6ab0cef 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -9,8 +9,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
 


Mime
View raw message