diff options
author | Sandy Ryza <sandy@cloudera.com> | 2014-04-01 08:26:31 +0530 |
---|---|---|
committer | Mridul Muralidharan <mridulm80@apache.org> | 2014-04-01 08:26:31 +0530 |
commit | 564f1c137caf07bd1f073ec6c93551dcad935ee5 (patch) | |
tree | e779409760ff20568cba9125b085eb4a7f6f6af0 | |
parent | 33b3c2a8c6c71b89744834017a183ea855e1697c (diff) | |
download | spark-564f1c137caf07bd1f073ec6c93551dcad935ee5.tar.gz spark-564f1c137caf07bd1f073ec6c93551dcad935ee5.tar.bz2 spark-564f1c137caf07bd1f073ec6c93551dcad935ee5.zip |
SPARK-1376. In the yarn-cluster submitter, rename "args" option to "arg"
Author: Sandy Ryza <sandy@cloudera.com>
Closes #279 from sryza/sandy-spark-1376 and squashes the following commits:
d8aebfa [Sandy Ryza] SPARK-1376. In the yarn-cluster submitter, rename "args" option to "arg"
-rw-r--r-- | docs/running-on-yarn.md | 7 | ||||
-rw-r--r-- | yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md index d8657c4bc7..982514391a 100644 --- a/docs/running-on-yarn.md +++ b/docs/running-on-yarn.md @@ -61,7 +61,7 @@ The command to launch the Spark application on the cluster is as follows: SPARK_JAR=<SPARK_ASSEMBLY_JAR_FILE> ./bin/spark-class org.apache.spark.deploy.yarn.Client \ --jar <YOUR_APP_JAR_FILE> \ --class <APP_MAIN_CLASS> \ - --args <APP_MAIN_ARGUMENTS> \ + --arg <APP_MAIN_ARGUMENT> \ --num-executors <NUMBER_OF_EXECUTOR_PROCESSES> \ --driver-memory <MEMORY_FOR_ApplicationMaster> \ --executor-memory <MEMORY_PER_EXECUTOR> \ @@ -72,7 +72,7 @@ The command to launch the Spark application on the cluster is as follows: --files <files_for_distributed_cache> \ --archives <archives_for_distributed_cache> -For example: +To pass multiple arguments the "arg" option can be specified multiple times. For example: # Build the Spark assembly JAR and the Spark examples JAR $ SPARK_HADOOP_VERSION=2.0.5-alpha SPARK_YARN=true sbt/sbt assembly @@ -85,7 +85,8 @@ For example: ./bin/spark-class org.apache.spark.deploy.yarn.Client \ --jar examples/target/scala-{{site.SCALA_BINARY_VERSION}}/spark-examples-assembly-{{site.SPARK_VERSION}}.jar \ --class org.apache.spark.examples.SparkPi \ - --args yarn-cluster \ + --arg yarn-cluster \ + --arg 5 \ --num-executors 3 \ --driver-memory 4g \ --executor-memory 2g \ diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala index c565f2dde2..3e4c739e34 100644 --- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala +++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala @@ -63,7 +63,10 @@ class ClientArguments(val args: Array[String], val sparkConf: SparkConf) { userClass = value args = tail - case ("--args") :: value :: tail => + case ("--args" | "--arg") :: value :: tail => + if (args(0) == "--args") { + println("--args is deprecated. Use --arg instead.") + } userArgsBuffer += value args = tail @@ -146,8 +149,8 @@ class ClientArguments(val args: Array[String], val sparkConf: SparkConf) { "Options:\n" + " --jar JAR_PATH Path to your application's JAR file (required in yarn-cluster mode)\n" + " --class CLASS_NAME Name of your application's main class (required)\n" + - " --args ARGS Arguments to be passed to your application's main class.\n" + - " Mutliple invocations are possible, each will be passed in order.\n" + + " --arg ARGS Argument to be passed to your application's main class.\n" + + " Multiple invocations are possible, each will be passed in order.\n" + " --num-executors NUM Number of executors to start (Default: 2)\n" + " --executor-cores NUM Number of cores for the executors (Default: 1).\n" + " --driver-memory MEM Memory for driver (e.g. 1000M, 2G) (Default: 512 Mb)\n" + |