[SPARK-1631] Correctly set the Yarn app name when launching the AM.

Marcelo Vanzin · pwendell · commit 3f779d872d84 · 2014-05-08T20:46:11.000-07:00
Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #539 from vanzin/yarn-app-name and squashes the following commits: 7d1ca4f [Marcelo Vanzin] [SPARK-1631] Correctly set the Yarn app name when launching the AM.
diff --git a/yarn/common/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala b/yarn/common/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
@@ -35,10 +35,10 @@ private[spark] class YarnClientSchedulerBackend(
 
   private[spark] def addArg(optionName: String, envVar: String, sysProp: String,
       arrayBuf: ArrayBuffer[String]) {
-    if (System.getProperty(sysProp) != null) {
-      arrayBuf += (optionName, System.getProperty(sysProp))
-    } else if (System.getenv(envVar) != null) {
+    if (System.getenv(envVar) != null) {
       arrayBuf += (optionName, System.getenv(envVar))
+    } else if (sc.getConf.contains(sysProp)) {
+      arrayBuf += (optionName, sc.getConf.get(sysProp))
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ private[spark] class YarnClientSchedulerBackend(`
`35`	`35`
`36`	`36`	`private[spark] def addArg(optionName: String, envVar: String, sysProp: String,`
`37`	`37`	`arrayBuf: ArrayBuffer[String]) {`
`38`		`- if (System.getProperty(sysProp) != null) {`
`39`		`- arrayBuf += (optionName, System.getProperty(sysProp))`
`40`		`- } else if (System.getenv(envVar) != null) {`
	`38`	`+ if (System.getenv(envVar) != null) {`
`41`	`39`	`arrayBuf += (optionName, System.getenv(envVar))`
	`40`	`+ } else if (sc.getConf.contains(sysProp)) {`
	`41`	`+ arrayBuf += (optionName, sc.getConf.get(sysProp))`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`