Skip to content

Commit 9c82a36

Browse files
author
Andrew Or
committed
Minor comment and wording updates
1 parent b4695e7 commit 9c82a36

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
438438
outStream.println("Unknown/unsupported param " + unknownParam)
439439
}
440440
outStream.println(
441-
"""Usage: spark-submit [options] <app jar | python file> [app options]
441+
"""Usage: spark-submit [options] <app jar | python file> [app arguments]
442442
|Options:
443443
| --master MASTER_URL spark://host:port, mesos://host:port, yarn, or local.
444444
| --deploy-mode DEPLOY_MODE Whether to launch the driver program locally ("client") or

core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
4646
val stateFuture = (master ? RequestMasterState)(timeout).mapTo[MasterStateResponse]
4747
val state = Await.result(stateFuture, timeout)
4848

49-
val workerHeaders = Seq("Id", "Address", "State", "Cores", "Memory")
49+
val workerHeaders = Seq("Worker Id", "Address", "State", "Cores", "Memory")
5050
val workers = state.workers.sortBy(_.id)
5151
val workerTable = UIUtils.listingTable(workerHeaders, workerRow, workers)
5252

53-
val appHeaders = Seq("ID", "Name", "Cores", "Memory per Node", "Submitted Time", "User",
54-
"State", "Duration")
53+
val appHeaders = Seq("Application ID", "Name", "Cores", "Memory per Node", "Submitted Time",
54+
"User", "State", "Duration")
5555
val activeApps = state.activeApps.sortBy(_.startTime).reverse
5656
val activeAppsTable = UIUtils.listingTable(appHeaders, appRow, activeApps)
5757
val completedApps = state.completedApps.sortBy(_.endTime).reverse
5858
val completedAppsTable = UIUtils.listingTable(appHeaders, appRow, completedApps)
5959

60-
val driverHeaders = Seq("ID", "Submitted Time", "Worker", "State", "Cores", "Memory",
61-
"Main Class")
60+
val driverHeaders = Seq("Submission ID", "Submitted Time", "Worker", "State", "Cores",
61+
"Memory", "Main Class")
6262
val activeDrivers = state.activeDrivers.sortBy(_.startTime).reverse
6363
val activeDriversTable = UIUtils.listingTable(driverHeaders, driverRow, activeDrivers)
6464
val completedDrivers = state.completedDrivers.sortBy(_.startTime).reverse
@@ -77,7 +77,7 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
7777
state.restUri.map { uri =>
7878
<li>
7979
<strong>REST URL:</strong> {uri}
80-
<span class="rest-uri"> (for standalone cluster mode in Spark 1.3+)</span>
80+
<span class="rest-uri"> (cluster mode)</span>
8181
</li>
8282
}.getOrElse { Seq.empty }
8383
}

core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestClient.scala

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,24 @@ import org.apache.spark.{Logging, SparkConf, SPARK_VERSION => sparkVersion}
3131
* This client is intended to communicate with the [[StandaloneRestServer]] and is
3232
* currently used for cluster mode only.
3333
*
34-
* The specific request sent to the server depends on the action as follows:
34+
* In protocol version v1, the REST URL takes the form http://[host:port]/v1/submissions/[action],
35+
* where [action] can be one of create, kill, or status. Each type of request is represented in
36+
* an HTTP message sent to the following prefixes:
3537
* (1) submit - POST to /submissions/create
3638
* (2) kill - POST /submissions/kill/[submissionId]
3739
* (3) status - GET /submissions/status/[submissionId]
3840
*
3941
* In the case of (1), parameters are posted in the HTTP body in the form of JSON fields.
4042
* Otherwise, the URL fully specifies the intended action of the client.
4143
*
42-
* Additionally, the base URL includes the version of the protocol. For instance:
43-
* http://1.2.3.4:6066/v1/submissions/create. Since the protocol is expected to be stable
44-
* across Spark versions, existing fields cannot be added or removed. In the rare event that
45-
* forward or backward compatibility is broken, Spark must introduce a new protocol version
46-
* (e.g. v2). The client and the server must communicate on the same version of the protocol.
44+
* Since the protocol is expected to be stable across Spark versions, existing fields cannot be
45+
* added or removed, though new optional fields can be added. In the rare event that forward or
46+
* backward compatibility is broken, Spark must introduce a new protocol version (e.g. v2).
47+
*
48+
* The client and the server must communicate using the same version of the protocol. If there
49+
* is a mismatch, the server will respond with the highest protocol version it supports. A future
50+
* implementation of this client can use that information to retry using the version specified
51+
* by the server.
4752
*/
4853
private[spark] class StandaloneRestClient extends Logging {
4954
import StandaloneRestClient._

0 commit comments

Comments
 (0)