Action -> SparkSubmitAction (minor)

Author: Andrew Or

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

@@ -31,8 +31,8 @@ import org.apache.spark.deploy.rest.StandaloneRestClient
  * Whether to submit, kill, or request the status of an application.
  * The latter two operations are currently supported only for standalone cluster mode.
  */
-private[spark] object Action extends Enumeration {
-  type Action = Value
+private[spark] object SparkSubmitAction extends Enumeration {
+  type SparkSubmitAction = Value
   val SUBMIT, KILL, REQUEST_STATUS = Value
 }
 
@@ -82,9 +82,9 @@ object SparkSubmit {
       printStream.println(appArgs)
     }
     appArgs.action match {
-      case Action.SUBMIT => submit(appArgs)
-      case Action.KILL => kill(appArgs)
-      case Action.REQUEST_STATUS => requestStatus(appArgs)
+      case SparkSubmitAction.SUBMIT => submit(appArgs)
+      case SparkSubmitAction.KILL => kill(appArgs)
+      case SparkSubmitAction.REQUEST_STATUS => requestStatus(appArgs)
     }
   }
 

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

@@ -22,8 +22,8 @@ import java.util.jar.JarFile
 
 import scala.collection.mutable.{ArrayBuffer, HashMap}
 
+import org.apache.spark.deploy.SparkSubmitAction.SparkSubmitAction
 import org.apache.spark.util.Utils
-import org.apache.spark.deploy.Action.Action
 
 /**
  * Parses and encapsulates arguments from the spark-submit script.
@@ -60,11 +60,11 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
   var driverToKill: String = null
   var driverToRequestStatusFor: String = null
 
-  def action: Action = {
+  def action: SparkSubmitAction = {
     (driverToKill, driverToRequestStatusFor) match {
-      case (null, null) => Action.SUBMIT
-      case (_, null) => Action.KILL
-      case (null, _) => Action.REQUEST_STATUS
+      case (null, null) => SparkSubmitAction.SUBMIT
+      case (_, null) => SparkSubmitAction.KILL
+      case (null, _) => SparkSubmitAction.REQUEST_STATUS
       case _ => SparkSubmit.printErrorAndExit(
         "Requested to both kill and request status for a driver. Choose only one.")
         null // never reached
@@ -189,9 +189,9 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
   /** Ensure that required fields exists. Call this only once all defaults are loaded. */
   private def validateArguments(): Unit = {
     action match {
-      case Action.SUBMIT => validateSubmitArguments()
-      case Action.KILL => validateKillArguments()
-      case Action.REQUEST_STATUS => validateStatusRequestArguments()
+      case SparkSubmitAction.SUBMIT => validateSubmitArguments()
+      case SparkSubmitAction.KILL => validateKillArguments()
+      case SparkSubmitAction.REQUEST_STATUS => validateStatusRequestArguments()
     }
   }