From 63c05b3f403626fe8ff4ce16a00047fb7335890c Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Fri, 23 Jan 2015 11:48:50 -0800 Subject: [PATCH] Remove MASTER as a field (minor) --- .../apache/spark/deploy/rest/DriverStatusRequestMessage.scala | 3 +-- .../apache/spark/deploy/rest/DriverStatusResponseMessage.scala | 3 +-- .../apache/spark/deploy/rest/KillDriverRequestMessage.scala | 3 +-- .../apache/spark/deploy/rest/KillDriverResponseMessage.scala | 3 +-- .../org/apache/spark/deploy/rest/StandaloneRestClient.scala | 3 --- .../org/apache/spark/deploy/rest/StandaloneRestServer.scala | 3 --- .../apache/spark/deploy/rest/SubmitDriverRequestMessage.scala | 3 +-- .../apache/spark/deploy/rest/SubmitDriverResponseMessage.scala | 3 +-- 8 files changed, 6 insertions(+), 18 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusRequestMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusRequestMessage.scala index e6b513bd4b1c0..bdb3c93992518 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusRequestMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusRequestMessage.scala @@ -26,9 +26,8 @@ private[spark] object DriverStatusRequestField case object ACTION extends DriverStatusRequestField case object CLIENT_SPARK_VERSION extends DriverStatusRequestField case object MESSAGE extends DriverStatusRequestField - case object MASTER extends DriverStatusRequestField case object DRIVER_ID extends DriverStatusRequestField - override val requiredFields = Seq(ACTION, CLIENT_SPARK_VERSION, MASTER, DRIVER_ID) + override val requiredFields = Seq(ACTION, CLIENT_SPARK_VERSION, DRIVER_ID) override val optionalFields = Seq(MESSAGE) } diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusResponseMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusResponseMessage.scala index 7a65f31c711f1..f0315db4c0072 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusResponseMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/DriverStatusResponseMessage.scala @@ -26,14 +26,13 @@ private[spark] object DriverStatusResponseField case object ACTION extends DriverStatusResponseField case object SERVER_SPARK_VERSION extends DriverStatusResponseField case object MESSAGE extends DriverStatusResponseField - case object MASTER extends DriverStatusResponseField case object DRIVER_ID extends DriverStatusResponseField case object SUCCESS extends DriverStatusResponseField // Standalone specific fields case object DRIVER_STATE extends DriverStatusResponseField case object WORKER_ID extends DriverStatusResponseField case object WORKER_HOST_PORT extends DriverStatusResponseField - override val requiredFields = Seq(ACTION, SERVER_SPARK_VERSION, MASTER, DRIVER_ID, SUCCESS) + override val requiredFields = Seq(ACTION, SERVER_SPARK_VERSION, DRIVER_ID, SUCCESS) override val optionalFields = Seq(MESSAGE, DRIVER_STATE, WORKER_ID, WORKER_HOST_PORT) } diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverRequestMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverRequestMessage.scala index ae3c62d496b7e..ee7d8e1f7bff0 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverRequestMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverRequestMessage.scala @@ -26,9 +26,8 @@ private[spark] object KillDriverRequestField case object ACTION extends KillDriverRequestField case object CLIENT_SPARK_VERSION extends KillDriverRequestField case object MESSAGE extends KillDriverRequestField - case object MASTER extends KillDriverRequestField case object DRIVER_ID extends KillDriverRequestField - override val requiredFields = Seq(ACTION, CLIENT_SPARK_VERSION, MASTER, DRIVER_ID) + override val requiredFields = Seq(ACTION, CLIENT_SPARK_VERSION, DRIVER_ID) override val optionalFields = Seq(MESSAGE) } diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverResponseMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverResponseMessage.scala index b5dc4ee557cb2..e6ab62980811c 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverResponseMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/KillDriverResponseMessage.scala @@ -26,10 +26,9 @@ private[spark] object KillDriverResponseField case object ACTION extends KillDriverResponseField case object SERVER_SPARK_VERSION extends KillDriverResponseField case object MESSAGE extends KillDriverResponseField - case object MASTER extends KillDriverResponseField case object DRIVER_ID extends KillDriverResponseField case object SUCCESS extends KillDriverResponseField - override val requiredFields = Seq(ACTION, SERVER_SPARK_VERSION, MESSAGE, MASTER, DRIVER_ID, SUCCESS) + override val requiredFields = Seq(ACTION, SERVER_SPARK_VERSION, MESSAGE, DRIVER_ID, SUCCESS) override val optionalFields = Seq.empty } diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestClient.scala b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestClient.scala index 4f5c31c080fb2..278c9af749b14 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestClient.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestClient.scala @@ -89,7 +89,6 @@ private[spark] class StandaloneRestClient extends SubmitRestClient { val em = Option(args.executorMemory).map { m => Utils.memoryStringToMb(m).toString }.orNull val message = new SubmitDriverRequestMessage() .setField(CLIENT_SPARK_VERSION, sparkVersion) - .setField(MASTER, args.master) .setField(APP_NAME, args.name) .setField(APP_RESOURCE, args.primaryResource) .setFieldIfNotNull(MAIN_CLASS, args.mainClass) @@ -116,7 +115,6 @@ private[spark] class StandaloneRestClient extends SubmitRestClient { import KillDriverRequestField._ new KillDriverRequestMessage() .setField(CLIENT_SPARK_VERSION, sparkVersion) - .setField(MASTER, master) .setField(DRIVER_ID, driverId) } @@ -127,7 +125,6 @@ private[spark] class StandaloneRestClient extends SubmitRestClient { import DriverStatusRequestField._ new DriverStatusRequestMessage() .setField(CLIENT_SPARK_VERSION, sparkVersion) - .setField(MASTER, master) .setField(DRIVER_ID, driverId) } diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala index 5a5afcc22833c..4b347386397c0 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala @@ -64,7 +64,6 @@ private[spark] class StandaloneRestServerHandler( new SubmitDriverResponseMessage() .setField(SERVER_SPARK_VERSION, sparkVersion) .setField(MESSAGE, response.message) - .setField(MASTER, masterUrl) .setField(SUCCESS, response.success.toString) .setFieldIfNotNull(DRIVER_ID, response.driverId.orNull) } @@ -79,7 +78,6 @@ private[spark] class StandaloneRestServerHandler( new KillDriverResponseMessage() .setField(SERVER_SPARK_VERSION, sparkVersion) .setField(MESSAGE, response.message) - .setField(MASTER, masterUrl) .setField(DRIVER_ID, driverId) .setField(SUCCESS, response.success.toString) } @@ -98,7 +96,6 @@ private[spark] class StandaloneRestServerHandler( } new DriverStatusResponseMessage() .setField(SERVER_SPARK_VERSION, sparkVersion) - .setField(MASTER, masterUrl) .setField(DRIVER_ID, driverId) .setField(SUCCESS, response.found.toString) .setFieldIfNotNull(DRIVER_STATE, response.state.map(_.toString).orNull) diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverRequestMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverRequestMessage.scala index b4c29d171b730..d3ad9c14844a0 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverRequestMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverRequestMessage.scala @@ -33,7 +33,6 @@ private[spark] object SubmitDriverRequestField case object ACTION extends SubmitDriverRequestField case object CLIENT_SPARK_VERSION extends SubmitDriverRequestField case object MESSAGE extends SubmitDriverRequestField - case object MASTER extends SubmitDriverRequestField case object APP_NAME extends SubmitDriverRequestField case object APP_RESOURCE extends SubmitDriverRequestField case object MAIN_CLASS extends SubmitDriverRequestField @@ -51,7 +50,7 @@ private[spark] object SubmitDriverRequestField case object APP_ARGS extends SubmitDriverRequestField case object SPARK_PROPERTIES extends SubmitDriverRequestField case object ENVIRONMENT_VARIABLES extends SubmitDriverRequestField - override val requiredFields = Seq(ACTION, CLIENT_SPARK_VERSION, MASTER, APP_NAME, APP_RESOURCE) + override val requiredFields = Seq(ACTION, CLIENT_SPARK_VERSION, APP_NAME, APP_RESOURCE) override val optionalFields = Seq(MESSAGE, MAIN_CLASS, JARS, FILES, PY_FILES, DRIVER_MEMORY, DRIVER_CORES, DRIVER_EXTRA_JAVA_OPTIONS, DRIVER_EXTRA_CLASS_PATH, DRIVER_EXTRA_LIBRARY_PATH, SUPERVISE_DRIVER, EXECUTOR_MEMORY, TOTAL_EXECUTOR_CORES, APP_ARGS, SPARK_PROPERTIES, diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverResponseMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverResponseMessage.scala index 7b3524b10f6c1..938ff1e32a752 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverResponseMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/SubmitDriverResponseMessage.scala @@ -26,10 +26,9 @@ private[spark] object SubmitDriverResponseField case object ACTION extends SubmitDriverResponseField case object SERVER_SPARK_VERSION extends SubmitDriverResponseField case object MESSAGE extends SubmitDriverResponseField - case object MASTER extends SubmitDriverResponseField case object SUCCESS extends SubmitDriverResponseField case object DRIVER_ID extends SubmitDriverResponseField - override val requiredFields = Seq(ACTION, SERVER_SPARK_VERSION, MESSAGE, MASTER, SUCCESS) + override val requiredFields = Seq(ACTION, SERVER_SPARK_VERSION, MESSAGE, SUCCESS) override val optionalFields = Seq(DRIVER_ID) }