[kylin] branch main updated: KYLIN-5069 Fix

[xx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/main by this push:
     new 6847d86  KYLIN-5069 Fix
6847d86 is described below

commit 6847d860056e9479b32d1cea8395cb689539203e
Author: yaqian.zhang <59...@qq.com>
AuthorDate: Wed Nov 17 11:16:00 2021 +0800

    KYLIN-5069 Fix
---
 ...{prepare_hadoop_dependency.sh => prepare-hadoop-dependency.sh} | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/bin/prepare_hadoop_dependency.sh b/build/bin/prepare-hadoop-dependency.sh
similarity index 93%
rename from build/bin/prepare_hadoop_dependency.sh
rename to build/bin/prepare-hadoop-dependency.sh
index 8388a26..e551357 100644
--- a/build/bin/prepare_hadoop_dependency.sh
+++ b/build/bin/prepare-hadoop-dependency.sh
@@ -27,8 +27,12 @@ then
     return
 fi
 
-if [ ! -d "$KYLIN_HOME/spark" ]; then
-  echo "Skip spark which not owned by kylin. SPARK_HOME is $SPARK_HOME and KYLIN_HOME is $KYLIN_HOME ."
+if [[ $SPARK_HOME != $KYLIN_HOME* ]]; then
+  echo "Skip spark which not owned by kylin. SPARK_HOME is $SPARK_HOME and KYLIN_HOME is $KYLIN_HOME.
+  Please download the correct version of Apache Spark, unzip it, rename it to 'spark' and put it in $KYLIN_HOME directory.
+  Do not use the spark that comes with your hadoop environment.
+  If your hadoop environment is cdh6.x, you need to do some additional operations in advance.
+  Please refer to the link: https://cwiki.apache.org/confluence/display/KYLIN/Deploy+Kylin+4+on+CDH+6."
   return
 fi