This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 048228b3dc783c69b431bca355860cc9d4c915a4
Author: benjobs <benj...@qq.com>
AuthorDate: Fri Nov 27 08:30:56 2020 +0800
KYLIN-4826 fix kylin.source.hive.warehouse-dir can't found
---
build/bin/find-hive-dependency.sh | 7 +++--
build/bin/kylin.sh | 36 ++++++++++++++++++++--
.../org/apache/kylin/common/KylinConfigBase.java | 13 +++++---
3 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/build/bin/find-hive-dependency.sh
b/build/bin/find-hive-dependency.sh
index 8ea1bf6..1012ffa 100755
--- a/build/bin/find-hive-dependency.sh
+++ b/build/bin/find-hive-dependency.sh
@@ -207,7 +207,8 @@ hive_dependency=${hive_conf_path}:${hive_lib}:${hcatalog}
verbose "hive dependency is $hive_dependency"
export hive_dependency
export hive_conf_path
-export hiveWarehouseDir=`hive -e 'set hive.metastore.warehouse.dir;' | awk
'{split($0,a,"="); print a[2]}'`
-echo "export hiveWarehouseDir=$hiveWarehouseDir"
-echo "export hive_dependency=$hive_dependency
+export hive_warehouse_dir=`hive -e 'set hive.metastore.warehouse.dir;' | awk
'{split($0,a,"="); print a[2]}'`
+echo "export hive_warehouse_dir=$hive_warehouse_dir"
+echo "export hive_warehouse_dir=$hive_warehouse_dir
+export hive_dependency=$hive_dependency
export hive_conf_path=$hive_conf_path" > ${dir}/cached-hive-dependency.sh
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index 56e21a5..7abe145 100755
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -37,12 +37,42 @@ function retrieveDependency() {
if [[ -z $reload_dependency && `ls -1 ${dir}/cached-* 2>/dev/null | wc -l`
-eq 6 ]]
then
echo "Using cached dependency..."
+
source ${dir}/cached-hive-dependency.sh
+ if [ -z "${hive_warehouse_dir}" ] || [ -z "${hive_dependency}" ] || [
-z "${hive_conf_path}" ]; then
+ echo "WARNING: Using ${dir}/cached-hive-dependency.sh failed,will be
use ${dir}/find-hive-dependency.sh"
+ source ${dir}/find-hive-dependency.sh
+ fi
+
source ${dir}/cached-hbase-dependency.sh
+ if [ -z "${hbase_dependency}" ]; then
+ echo "WARNING: Using ${dir}/cached-hbase-dependency.sh failed,will
be use ${dir}/find-hbase-dependency.sh"
+ source ${dir}/find-hbase-dependency.sh
+ fi
+
source ${dir}/cached-hadoop-conf-dir.sh
+ if [ -z "${kylin_hadoop_conf_dir}" ]; then
+ echo "WARNING: Using ${dir}/cached-hadoop-conf-dir.sh failed,will be
use ${dir}/find-hadoop-conf-dir.sh"
+ source ${dir}/find-hadoop-conf-dir.sh
+ fi
+
source ${dir}/cached-kafka-dependency.sh
+ if [ -z "${kafka_dependency}" ]; then
+ echo "WARNING: Using ${dir}/cached-kafka-dependency.sh failed,will
be use ${dir}/find-kafka-dependency.sh"
+ source ${dir}/find-kafka-dependency.sh
+ fi
+
source ${dir}/cached-spark-dependency.sh
+ if [ -z "${spark_dependency}" ]; then
+ echo "WARNING: Using ${dir}/cached-spark-dependency.sh failed,will
be use ${dir}/find-spark-dependency.sh"
+ source ${dir}/find-spark-dependency.sh
+ fi
+
source ${dir}/cached-flink-dependency.sh
+ if [ -z "${flink_dependency}" ]; then
+ echo "WARNING: Using ${dir}/cached-flink-dependency.sh failed,will
be use ${dir}/find-flink-dependency.sh"
+ source ${dir}/find-flink-dependency.sh
+ fi
else
source ${dir}/find-hive-dependency.sh
source ${dir}/find-hbase-dependency.sh
@@ -57,7 +87,7 @@ function retrieveDependency() {
echo "WARNING: ${dir}/setenv.sh is deprecated and ignored, please
remove it and use ${KYLIN_HOME}/conf/setenv.sh instead"
source ${dir}/setenv.sh
fi
-
+
if [ -f "${KYLIN_HOME}/conf/setenv.sh" ]; then
source ${KYLIN_HOME}/conf/setenv.sh
fi
@@ -154,7 +184,7 @@ function retrieveStartCommand() {
-Dkylin.flink.dependency=${flink_dependency} \
-Dkylin.hadoop.conf.dir=${kylin_hadoop_conf_dir} \
-Dkylin.server.host-address=${kylin_rest_address} \
- -Dkylin.source.hive.warehouse-dir=${hiveWarehouseDir} \
+ -Dkylin.source.hive.warehouse-dir=${hive_warehouse_dir} \
-Dspring.profiles.active=${spring_profile} \
org.apache.hadoop.util.RunJar ${tomcat_root}/bin/bootstrap.jar
org.apache.catalina.startup.Bootstrap start"
}
@@ -224,7 +254,7 @@ then
echo "Check the log at ${KYLIN_HOME}/logs/kylin.log"
echo "Web UI is at http://${kylin_rest_address_arr}/kylin";
exit 0
-
+
# run command
elif [ "$1" == "run" ]
then
diff --git
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index a0c9373..2eef48d 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -716,7 +716,7 @@ public abstract class KylinConfigBase implements
Serializable {
public boolean isRowKeyEncodingAutoConvert() {
return
Boolean.parseBoolean(getOptional("kylin.cube.rowkey-encoding-auto-convert",
"true"));
}
-
+
public String getSegmentAdvisor() {
return getOptional("kylin.cube.segment-advisor",
"org.apache.kylin.cube.CubeSegmentAdvisor");
}
@@ -1052,7 +1052,12 @@ public abstract class KylinConfigBase implements
Serializable {
//
============================================================================
public String getHiveDatabaseDir(String databaseName) {
- String dbDir = System.getProperty("kylin.source.hive.warehouse-dir");
+ String dbDir = getOptional("kylin.source.hive.warehouse-dir", "");
+ if (!StringUtil.isEmpty(dbDir)) {
+ logger.info("kylin.source.hive.warehouse-dir is {}", dbDir);
+ } else {
+ logger.warn("kylin.source.hive.warehouse-dir is null");
+ }
if (!StringUtil.isEmpty(databaseName) &&
!databaseName.equalsIgnoreCase(DEFAULT)) {
if (!dbDir.endsWith("/")) {
dbDir += "/";
@@ -2013,7 +2018,7 @@ public abstract class KylinConfigBase implements
Serializable {
public boolean isPushDownEnabled() {
return
Boolean.parseBoolean(this.getOptional("kylin.query.pushdown.enabled", FALSE))
- || StringUtils.isNotEmpty(getPushDownRunnerClassName());
+ || StringUtils.isNotEmpty(getPushDownRunnerClassName());
}
public boolean isPushDownUpdateEnabled() {
@@ -2327,7 +2332,7 @@ public abstract class KylinConfigBase implements
Serializable {
public String getKylinMetricsEventTimeZone() {
return getOptional("kylin.metrics.event-time-zone",
getTimeZone()).toUpperCase(Locale.ROOT);
}
-
+
public boolean isKylinMetricsMonitorEnabled() {
return
Boolean.parseBoolean(getOptional("kylin.metrics.monitor-enabled", FALSE));
}
