From 3f779d872d8459b262b3db9e4d12b011910b6ce9 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Thu, 8 May 2014 20:46:11 -0700
Subject: [PATCH] [SPARK-1631] Correctly set the Yarn app name when launching
the AM.
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.
---
.../scheduler/cluster/YarnClientSchedulerBackend.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
index ce2dde0631..2924189077 100644
--- 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))
}
}
--
GitLab