Skip to content

Commit b9e2a08

Browse files
author
Andrew Or
committed
Minor comments
1 parent 02b5cea commit b9e2a08

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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
@@ -59,11 +59,11 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
5959
val sparkProperties: HashMap[String, String] = new HashMap[String, String]()
6060

6161
// Standalone cluster mode only
62-
var useRest: Boolean = true
6362
var supervise: Boolean = false
6463
var driverCores: String = null
6564
var submissionToKill: String = null
6665
var submissionToRequestStatusFor: String = null
66+
var useRest: Boolean = true // used internally
6767

6868
/** Default properties present in the currently defined defaults file. */
6969
lazy val defaultSparkProperties: HashMap[String, String] = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ private class ErrorServlet extends StandaloneRestServlet {
439439
// If there is a version mismatch, include the highest protocol version that
440440
// this server supports in case the client wants to retry with our version
441441
if (versionMismatch) {
442-
error.protocolVersion = serverVersion
442+
error.highestProtocolVersion = serverVersion
443443
response.setStatus(StandaloneRestServer.SC_UNKNOWN_PROTOCOL_VERSION)
444444
} else {
445445
response.setStatus(HttpServletResponse.SC_BAD_REQUEST)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private[spark] class SubmissionStatusResponse extends SubmitRestProtocolResponse
7676
private[spark] class ErrorResponse extends SubmitRestProtocolResponse {
7777
// The highest protocol version that the server knows about
7878
// This is set when the client specifies an unknown version
79-
var protocolVersion: String = null
79+
var highestProtocolVersion: String = null
8080
protected override def doValidate(): Unit = {
8181
super.doValidate()
8282
assertFieldIsSet(message, "message")

0 commit comments

Comments
 (0)