yiheng 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_r351091430
########## File path: server/src/main/scala/org/apache/livy/server/interactive/InteractiveSession.scala ########## @@ -332,7 +348,11 @@ object InteractiveSession extends Logging { LivySparkUtils.formatSparkVersion(livyConf.get(LivyConf.LIVY_SPARK_VERSION)) val scalaVersion = livyConf.get(LivyConf.LIVY_SPARK_SCALA_VERSION) - mergeConfList(livyJars(livyConf, scalaVersion), LivyConf.SPARK_JARS) + if (conf.get(LivyConf.SPARK_JARS) != None || conf.get(LivyConf.SPARK_JARS) == None){ Review comment: For the spark file conf ```scala val (files, mergeFileConf) = if (!sparkFiles.isEmpty || yarnFiles.isEmpty) { (sparkFiles, LivyConf.SPARK_FILES) } else { (yarnFiles, LivyConf.SPARK_YARN_DIST_FILES) } ... mergeConfList(List(file.getAbsolutePath), mergeFileConf) ``` ---------------------------------------------------------------- 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