Minor fixes

Author: Andrew Or

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

@@ -118,10 +118,9 @@ object SparkSubmit {
    */
   private def submit(args: SparkSubmitArguments): Unit = {
     val (childArgs, childClasspath, sysProps, childMainClass) = prepareSubmitEnvironment(args)
-    val isStandaloneCluster = args.master.startsWith("spark://") && args.deployMode == "cluster"
     // In standalone cluster mode, use the stable application submission REST protocol.
     // Otherwise, just call the main method of the child class.
-    if (isStandaloneCluster) {
+    if (args.isStandaloneCluster) {
       // NOTE: since we mutate the values of some configs in `prepareSubmitEnvironment`, we
       // must update the corresponding fields in the original SparkSubmitArguments to reflect
       // these changes.
@@ -146,7 +145,7 @@ object SparkSubmit {
    */
   private[spark] def prepareSubmitEnvironment(args: SparkSubmitArguments)
       : (Seq[String], Seq[String], Map[String, String], String) = {
-    // Environment needed to launch the child main class
+    // Return values
     val childArgs = new ArrayBuffer[String]()
     val childClasspath = new ArrayBuffer[String]()
     val sysProps = new HashMap[String, String]()
@@ -158,7 +157,7 @@ object SparkSubmit {
       case m if m.startsWith("spark") => STANDALONE
       case m if m.startsWith("mesos") => MESOS
       case m if m.startsWith("local") => LOCAL
-      case _ => printErrorAndExit("Master must start with yarn, spark, mesos, local, or rest"); -1
+      case _ => printErrorAndExit("Master must start with yarn, spark, mesos or local"); -1
     }
 
     // Set the deploy mode; default is client mode

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

@@ -231,7 +231,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
   }
 
   private def validateKillArguments(): Unit = {
-    if (!master.startsWith("spark://") || deployMode != "cluster") {
+    if (!isStandaloneCluster) {
       SparkSubmit.printErrorAndExit("Killing drivers is only supported in standalone cluster mode")
     }
     if (driverToKill == null) {
@@ -240,7 +240,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
   }
 
   private def validateStatusRequestArguments(): Unit = {
-    if (!master.startsWith("spark://") || deployMode != "cluster") {
+    if (!isStandaloneCluster) {
       SparkSubmit.printErrorAndExit(
         "Requesting driver statuses is only supported in standalone cluster mode")
     }
@@ -249,6 +249,10 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
     }
   }
 
+  def isStandaloneCluster: Boolean = {
+    master.startsWith("spark://") && deployMode == "cluster"
+  }
+
   override def toString = {
     s"""Parsed arguments:
     |  master                  $master

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

@@ -135,8 +135,6 @@ private[spark] class StandaloneRestServerHandler(
     // Translate all fields to the relevant Spark properties
     val conf = new SparkConf(false)
       .setAll(sparkProperties)
-      // Use the actual master URL instead of the one that refers to this REST server
-      // Otherwise, once the driver is launched it will contact with the wrong server
       .set("spark.master", masterUrl)
       .set("spark.app.name", appName)
     jars.foreach { j => conf.set("spark.jars", j) }