Skip to content

Kylin 3726: KylinSession should load spark properties from spark-defaults.conf #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaofengshi merged 1 commit into from
Dec 23, 2018
Merged

Kylin 3726: KylinSession should load spark properties from spark-defaults.conf #403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions engine-spark/src/main/java/org/apache/spark/sql/KylinSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down Expand Up @@ -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)
Expand Down