minor changes

apache · Feb 11, 2015 · 463f02c · 463f02c
1 parent a60aea8
commit 463f02c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
@@ -40,6 +40,7 @@ import org.apache.ivy.plugins.resolver.{ChainResolver, IBiblioResolver}
 import org.apache.spark.deploy.rest._
 import org.apache.spark.executor._
 import org.apache.spark.util.{ChildFirstURLClassLoader, MutableURLClassLoader, Utils}
+import org.apache.spark
 
 /**
  * Whether to submit, kill, or request the status of an application.
@@ -89,6 +90,10 @@ object SparkSubmit {
     printStream.println("Run with --help for usage help or --verbose for debug output")
     exitFn()
   }
+  private[spark] def printVersionAndExit() = {
+    printStream.println(s"Spark Version: ${spark.SPARK_VERSION}")
+    exitFn()
+  }
 
   def main(args: Array[String]) {
     val appArgs = new SparkSubmitArguments(args)

diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
@@ -417,6 +417,9 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
         verbose = true
         parse(tail)
 
+      case ("--version") :: tail =>
+        SparkSubmit.printVersionAndExit()
+
       case EQ_SEPARATED_OPT(opt, value) :: tail =>
         parse(opt :: value :: tail)
 
@@ -484,7 +487,8 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
         |  --proxy-user NAME           User to impersonate when submitting the application.
         |
         |  --help, -h                  Show this help message and exit
-        |  --verbose, -v               Print additional debug output
+        |  --verbose,                  Print additional debug output
+        |  --version, -v               Print the version of current Spark
         |
         | Spark standalone with cluster deploy mode only:
         |  --driver-cores NUM          Cores for driver (Default: 1).