diff options
| author | Matei Zaharia <matei@databricks.com> | 2013-12-28 17:24:21 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2013-12-28 17:24:21 -0500 |
| commit | a16c52ed1bf5b416c9ec8c13dbe84ee203032b1b (patch) | |
| tree | 1e49a266a54366057a3a7b16216e4846955112b5 /core | |
| parent | 642029e7f43322f84abe4f7f36bb0b1b95d8101d (diff) | |
| download | spark-a16c52ed1bf5b416c9ec8c13dbe84ee203032b1b.tar.gz spark-a16c52ed1bf5b416c9ec8c13dbe84ee203032b1b.tar.bz2 spark-a16c52ed1bf5b416c9ec8c13dbe84ee203032b1b.zip | |
Check for SPARK_YARN_MODE through a system property too since it can
sometimes be set that way (undoes a change in previous commit)
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala b/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala index 4f402c1121..27dc42bf7e 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala @@ -69,7 +69,8 @@ class SparkHadoopUtil { object SparkHadoopUtil { private val hadoop = { - val yarnMode = java.lang.Boolean.valueOf(System.getenv("SPARK_YARN_MODE")) + val yarnMode = java.lang.Boolean.valueOf( + System.getProperty("SPARK_YARN_MODE", System.getenv("SPARK_YARN_MODE"))) if (yarnMode) { try { Class.forName("org.apache.spark.deploy.yarn.YarnSparkHadoopUtil") |