diff options
| author | Mark Grover <mark@apache.org> | 2016-04-14 18:51:43 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-04-14 18:51:43 -0700 |
| commit | ff9ae61a3b7bbbfc2aac93a99c05a9e1ea9c08bc (patch) | |
| tree | b2ea17d703d24540a69f40c66f8bfc35c6a2cc37 /core | |
| parent | c80586d9e820d19fc328b3e4c6f1c1439f5583a7 (diff) | |
| download | spark-ff9ae61a3b7bbbfc2aac93a99c05a9e1ea9c08bc.tar.gz spark-ff9ae61a3b7bbbfc2aac93a99c05a9e1ea9c08bc.tar.bz2 spark-ff9ae61a3b7bbbfc2aac93a99c05a9e1ea9c08bc.zip | |
[SPARK-14601][DOC] Minor doc/usage changes related to removal of Spark assembly
## What changes were proposed in this pull request?
Removing references to assembly jar in documentation.
Adding an additional (previously undocumented) usage of spark-submit to run examples.
## How was this patch tested?
Ran spark-submit usage to ensure formatting was fine. Ran examples using SparkSubmit.
Author: Mark Grover <mark@apache.org>
Closes #12365 from markgrover/spark-14601.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala b/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala index c0a9e3f280..6227a30dc9 100644 --- a/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala +++ b/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala @@ -62,7 +62,7 @@ object PythonRunner { // ready to serve connections. thread.join() - // Build up a PYTHONPATH that includes the Spark assembly JAR (where this class is), the + // Build up a PYTHONPATH that includes the Spark assembly (where this class is), the // python directories in SPARK_HOME (if set), and any files in the pyFiles argument val pathElements = new ArrayBuffer[String] pathElements ++= formattedPyFiles diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index ec6d48485f..78da1b70c5 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -478,7 +478,8 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S val command = sys.env.get("_SPARK_CMD_USAGE").getOrElse( """Usage: spark-submit [options] <app jar | python file> [app arguments] |Usage: spark-submit --kill [submission ID] --master [spark://...] - |Usage: spark-submit --status [submission ID] --master [spark://...]""".stripMargin) + |Usage: spark-submit --status [submission ID] --master [spark://...] + |Usage: spark-submit run-example [options] example-class [example args]""".stripMargin) outStream.println(command) val mem_mb = Utils.DEFAULT_DRIVER_MEM_MB |