Limmen commented on a change in pull request #165: [LIVY-581] Fix edge-case where livy overrides user-provided spark properties instead of appending URL: https://github.com/apache/incubator-livy/pull/165#discussion_r350850028
########## File path: server/src/main/scala/org/apache/livy/server/interactive/InteractiveSession.scala ########## @@ -286,16 +286,33 @@ object InteractiveSession extends Logging { } def mergeHiveSiteAndHiveDeps(sparkMajorVersion: Int): Unit = { - val sparkFiles = conf.get("spark.files").map(_.split(",")).getOrElse(Array.empty[String]) - hiveSiteFile(sparkFiles, livyConf) match { + val yarnFiles = conf.get(LivyConf.SPARK_YARN_DIST_FILES) + .map(_.split(",")).getOrElse(Array.empty[String]) + val sparkFiles = conf.get(LivyConf.SPARK_FILES) + .map(_.split(",")).getOrElse(Array.empty[String]) + var files = Array.empty[String] + if (!sparkFiles.isEmpty || yarnFiles.isEmpty) files = sparkFiles else files = yarnFiles + hiveSiteFile(files, livyConf) match { case (_, true) => debug("Enable HiveContext because hive-site.xml is found in user request.") - mergeConfList(datanucleusJars(livyConf, sparkMajorVersion), LivyConf.SPARK_JARS) + if (conf.get(LivyConf.SPARK_JARS) != None || conf.get(LivyConf.SPARK_YARN_JARS) == None) { Review comment: ping @yiheng ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services