diff options
| author | Reynold Xin <rxin@apache.org> | 2013-12-15 12:49:02 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2013-12-15 12:49:02 -0800 |
| commit | c55e698559828eac65d7fc093c3109e08087f253 (patch) | |
| tree | 5348573df5eeff911dcd42af5f15ceafbe78b413 | |
| parent | ab85f88fd77a883684cec0a58222d983b9bd18fd (diff) | |
| parent | 842eb55fb53e08daed34d161167854b8b093fbd5 (diff) | |
| download | spark-c55e698559828eac65d7fc093c3109e08087f253.tar.gz spark-c55e698559828eac65d7fc093c3109e08087f253.tar.bz2 spark-c55e698559828eac65d7fc093c3109e08087f253.zip | |
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.
| -rw-r--r-- | new-yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 1 | ||||
| -rw-r--r-- | yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 1 |
2 files changed, 2 insertions, 0 deletions
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 9efb28a942..70be15d0a3 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 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 b9dbc3fb87..b3a7886d93 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 |