aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorY.CORP.YAHOO.COM\tgraves <tgraves@thatenemy-lm.champ.corp.yahoo.com>2013-08-28 13:26:26 -0500
committerY.CORP.YAHOO.COM\tgraves <tgraves@thatenemy-lm.champ.corp.yahoo.com>2013-08-28 13:26:26 -0500
commitaac1214ee48ef143b0164f740380cdb0a5a7383b (patch)
tree26634c525cf28549c2af08c369383429b4070b76 /core
parent3f206bf0b56888c718983b7832677a894e36eee3 (diff)
downloadspark-aac1214ee48ef143b0164f740380cdb0a5a7383b.tar.gz
spark-aac1214ee48ef143b0164f740380cdb0a5a7383b.tar.bz2
spark-aac1214ee48ef143b0164f740380cdb0a5a7383b.zip
Change Executor to only look at the env variable SPARK_YARN_MODE
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/executor/Executor.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/executor/Executor.scala b/core/src/main/scala/spark/executor/Executor.scala
index 25f55b391b..fa82d2b324 100644
--- a/core/src/main/scala/spark/executor/Executor.scala
+++ b/core/src/main/scala/spark/executor/Executor.scala
@@ -63,7 +63,7 @@ private[spark] class Executor(
// If we are in yarn mode, systems can have different disk layouts so we must set it
// to what Yarn on this system said was available. This will be used later when SparkEnv
// created.
- if (java.lang.Boolean.valueOf(System.getProperty("SPARK_YARN_MODE", System.getenv("SPARK_YARN_MODE")))) {
+ if (java.lang.Boolean.valueOf(System.getenv("SPARK_YARN_MODE"))) {
System.setProperty("spark.local.dir", getYarnLocalDirs())
}