You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/12/15 21:49:05 UTC
[1/2] git commit: Fix the --name option for Spark on Yarn
Updated Branches:
refs/heads/master ab85f88fd -> c55e69855
Fix the --name option for Spark on Yarn
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/842eb55f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/842eb55f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/842eb55f
Branch: refs/heads/master
Commit: 842eb55fb53e08daed34d161167854b8b093fbd5
Parents: d2efe13
Author: Thomas Graves <tg...@apache.org>
Authored: Thu Dec 12 11:11:09 2013 -0600
Committer: Thomas Graves <tg...@apache.org>
Committed: Thu Dec 12 11:11:09 2013 -0600
----------------------------------------------------------------------
.../main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 1 +
.../main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/842eb55f/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
----------------------------------------------------------------------
diff --git a/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala b/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
index 9efb28a..70be15d 100644
--- a/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
+++ b/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
@@ -92,6 +92,7 @@ class ClientArguments(val args: Array[String]) {
case ("--name") :: value :: tail =>
appName = value
+ args = tail
case ("--addJars") :: value :: tail =>
addJars = value
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/842eb55f/yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
----------------------------------------------------------------------
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
index b9dbc3f..b3a7886 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
@@ -89,6 +89,7 @@ class ClientArguments(val args: Array[String]) {
case ("--name") :: value :: tail =>
appName = value
+ args = tail
case ("--addJars") :: value :: tail =>
addJars = value
[2/2] git commit: Merge pull request #257 from
tgravescs/sparkYarnFixName
Posted by rx...@apache.org.
Merge pull request #257 from tgravescs/sparkYarnFixName
Fix the --name option for Spark on Yarn
Looks like the --name option accidentally got broken in one of the merges. The Client hangs if the --name option is used right now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c55e6985
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c55e6985
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c55e6985
Branch: refs/heads/master
Commit: c55e698559828eac65d7fc093c3109e08087f253
Parents: ab85f88 842eb55
Author: Reynold Xin <rx...@apache.org>
Authored: Sun Dec 15 12:49:02 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Sun Dec 15 12:49:02 2013 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 1 +
.../main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------