Minor. Fixed bug in SparkApp that merges user YARN tags and Livy YARN…

… tags incorrectly. Closes apache#193
ksakellis · Sep 20, 2016 · 91058d2 · 91058d2
1 parent 4e85c49
commit 91058d2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala b/server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala
@@ -68,7 +68,7 @@ object SparkApp {
       livyConf: LivyConf,
       sparkConf: Map[String, String]): Map[String, String] = {
     if (livyConf.isRunningOnYarn()) {
-      val userYarnTags = sparkConf.get(uniqueAppTag).map("," + _).getOrElse("")
+      val userYarnTags = sparkConf.get(SPARK_YARN_TAG_KEY).map("," + _).getOrElse("")
       val mergedYarnTags = uniqueAppTag + userYarnTags
       sparkConf ++ Map(
         SPARK_YARN_TAG_KEY -> mergedYarnTags,