[kylin] branch kylin-on-parquet updated: KYLIN-3726: KylinSession should load spark properties from spark-defaults.conf

[shaofengshi]

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

shaofengshi pushed a commit to branch kylin-on-parquet
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet by this push:
     new 011ff08  KYLIN-3726: KylinSession should load spark properties from 
spark-defaults.conf
011ff08 is described below

commit 011ff0887d4a83b3a3373487ad66ce4b652bd7ff
Author: Liu Shaohui <liushao...@xiaomi.com>
AuthorDate: Tue Dec 18 17:52:50 2018 +0800

    KYLIN-3726: KylinSession should load spark properties from 
spark-defaults.conf
---
 engine-spark/src/main/java/org/apache/spark/sql/KylinSession.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engine-spark/src/main/java/org/apache/spark/sql/KylinSession.scala 
b/engine-spark/src/main/java/org/apache/spark/sql/KylinSession.scala
index 72c4ba5..663f6c9 100644
--- a/engine-spark/src/main/java/org/apache/spark/sql/KylinSession.scala
+++ b/engine-spark/src/main/java/org/apache/spark/sql/KylinSession.scala
@@ -30,7 +30,7 @@ import org.apache.spark.scheduler.{SparkListener, 
SparkListenerApplicationEnd}
 import org.apache.spark.sql.SparkSession.Builder
 import org.apache.spark.sql.internal.{SessionState, SharedState}
 import org.apache.spark.sql.manager.UdfManager
-import org.apache.spark.util.{KylinReflectUtils, XmlUtils}
+import org.apache.spark.util.{KylinReflectUtils, Utils, XmlUtils}
 import org.apache.spark.{SparkConf, SparkContext}
 
 import scala.collection.JavaConverters._
@@ -133,7 +133,8 @@ object KylinSession extends Logging {
 
     def initSparkConf(): SparkConf = {
       val sparkConf = new SparkConf()
-
+      logInfo("Try to load spark properties from spark-defaults.conf")
+      Utils.loadDefaultSparkProperties(sparkConf)
       kylinConfig.getSparkConf.asScala.foreach {
         case (k, v) =>
           sparkConf.set(k, v)