You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/09/07 13:21:29 UTC
[06/13] incubator-kylin git commit: KYLIN-957 fix bug in check-env.sh
KYLIN-957 fix bug in check-env.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ff9189cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ff9189cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ff9189cd
Branch: refs/heads/1.x-staging
Commit: ff9189cd1137f2fe144d68081d63c0be315a62b5
Parents: 66bd59e
Author: shaofengshi <sh...@apache.org>
Authored: Mon Sep 7 13:47:37 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Sep 7 13:48:06 2015 +0800
----------------------------------------------------------------------
bin/check-env.sh | 9 ++++++++-
conf/kylin.properties | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ff9189cd/bin/check-env.sh
----------------------------------------------------------------------
diff --git a/bin/check-env.sh b/bin/check-env.sh
index 9efb393..56f2436 100644
--- a/bin/check-env.sh
+++ b/bin/check-env.sh
@@ -47,7 +47,14 @@ fi
WORKING_DIR=`sh $KYLIN_HOME/bin/get-properties.sh kylin.hdfs.working.dir`
HADOOP_FS=`sh $KYLIN_HOME/bin/get-properties.sh kylin.hadoop.cluster.fs`
-hadoop fs -mkdir -p $HADOOP_FS$WORKING_DIR
+
+if [ "$HADOOP_FS" ]
+then
+ hadoop fs -Dfs.defaultFS=$HADOOP_FS -mkdir -p $WORKING_DIR
+else
+ hadoop fs -mkdir -p $WORKING_DIR
+fi
+
if [ $? != 0 ]
then
echo "failed to create $HADOOP_FS$WORKING_DIR, Please make sure the user has right to access $HADOOP_FS$WORKING_DIR"
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ff9189cd/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
index 3850005..0d1827e 100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
@@ -29,11 +29,11 @@ kylin.storage.url=hbase
# Temp folder in hdfs, make sure user has the right access to the hdfs directory
kylin.hdfs.working.dir=/kylin
-# Hadoop Cluster FileSystem, which serving hive and mapreduce, format as hdfs://hadoop-cluster/ (end with /)
+# Hadoop Cluster FileSystem, which serving hive and mapreduce, format as hdfs://hadoop-cluster:8020
# leave empty if using default fs configured by local core-site.xml
kylin.hadoop.cluster.fs=
-# HBase Cluster FileSystem, which serving hbase, format as hdfs://hbase-cluster/ (end with /)
+# HBase Cluster FileSystem, which serving hbase, format as hdfs://hbase-cluster:8020
# leave empty if hbase running on same cluster with hive and mapreduce
kylin.hbase.cluster.fs=