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/03/11 01:42:40 UTC
git commit: SPARK-1211. In ApplicationMaster,
set spark.master system property to "y...
Repository: spark
Updated Branches:
refs/heads/master 2a5161708 -> 2a2c9645e
SPARK-1211. In ApplicationMaster, set spark.master system property to "y...
...arn-cluster"
Author: Sandy Ryza <sa...@cloudera.com>
Closes #118 from sryza/sandy-spark-1211 and squashes the following commits:
d4001c7 [Sandy Ryza] SPARK-1211. In ApplicationMaster, set spark.master system property to "yarn-cluster"
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2a2c9645
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2a2c9645
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2a2c9645
Branch: refs/heads/master
Commit: 2a2c9645e4ea08cd1408151a33d2d52f6752404a
Parents: 2a51617
Author: Sandy Ryza <sa...@cloudera.com>
Authored: Mon Mar 10 17:42:33 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Mar 10 17:42:33 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala | 3 +++
.../scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2a2c9645/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
----------------------------------------------------------------------
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index bb574f4..87785cd 100644
--- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -79,6 +79,9 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
// other spark processes running on the same box
System.setProperty("spark.ui.port", "0")
+ // when running the AM, the Spark master is always "yarn-cluster"
+ System.setProperty("spark.master", "yarn-cluster")
+
// Use priority 30 as its higher then HDFS. Its same priority as MapReduce is using.
ShutdownHookManager.get().addShutdownHook(new AppMasterShutdownHook(this), 30)
http://git-wip-us.apache.org/repos/asf/spark/blob/2a2c9645/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
----------------------------------------------------------------------
diff --git a/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index b48a2d5..57d1577 100644
--- a/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -82,6 +82,9 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
// other spark processes running on the same box
System.setProperty("spark.ui.port", "0")
+ // when running the AM, the Spark master is always "yarn-cluster"
+ System.setProperty("spark.master", "yarn-cluster")
+
// Use priority 30 as it's higher then HDFS. It's same priority as MapReduce is using.
ShutdownHookManager.get().addShutdownHook(new AppMasterShutdownHook(this), 30)