You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/02 06:29:45 UTC
[07/33] git commit: Check for SPARK_YARN_MODE through a system
property too since it can sometimes be set that way (undoes a change in
previous commit)
Check for SPARK_YARN_MODE through a system property too since it can
sometimes be set that way (undoes a change in previous commit)
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a16c52ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a16c52ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a16c52ed
Branch: refs/heads/master
Commit: a16c52ed1bf5b416c9ec8c13dbe84ee203032b1b
Parents: 642029e
Author: Matei Zaharia <ma...@databricks.com>
Authored: Sat Dec 28 17:24:21 2013 -0500
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Sat Dec 28 17:24:21 2013 -0500
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a16c52ed/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala
----------------------------------------------------------------------
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 4f402c1..27dc42b 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")