From 463f02c1f5e4c7b0a6f3cd12a817472c6b19bce0 Mon Sep 17 00:00:00 2001 From: uncleGen Date: Wed, 11 Feb 2015 13:00:18 +0800 Subject: [PATCH 1/3] minor changes --- .../main/scala/org/apache/spark/deploy/SparkSubmit.scala | 5 +++++ .../org/apache/spark/deploy/SparkSubmitArguments.scala | 6 +++++- 2 files changed, 10 insertions(+), 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 index 80cc0587286b1..13678f9012d50 100644 --- 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 index fa38070c6fcfe..730aa3ba95a1d 100644 --- 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). From 015ddeed95df5dc35be4ed179c26186a9713a49b Mon Sep 17 00:00:00 2001 From: uncleGen Date: Wed, 11 Feb 2015 13:01:50 +0800 Subject: [PATCH 2/3] minor changes --- .../scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index 730aa3ba95a1d..cb61e55e14183 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -413,11 +413,11 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St case ("--help" | "-h") :: tail => printUsageAndExit(0) - case ("--verbose" | "-v") :: tail => + case ("--verbose") :: tail => verbose = true parse(tail) - case ("--version") :: tail => + case ("--version" | "-v") :: tail => SparkSubmit.printVersionAndExit() case EQ_SEPARATED_OPT(opt, value) :: tail => From 9f2127cd0863437cf1f5add51d0709165b7f3fe8 Mon Sep 17 00:00:00 2001 From: "genmao.ygm" Date: Fri, 13 Feb 2015 14:41:22 +0800 Subject: [PATCH 3/3] revert the behavior of "-v" --- .../scala/org/apache/spark/deploy/SparkSubmit.scala | 11 +++++++++-- .../apache/spark/deploy/SparkSubmitArguments.scala | 8 ++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index 13678f9012d50..346c7ed7ddd30 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -40,7 +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 +import org.apache.spark._ /** * Whether to submit, kill, or request the status of an application. @@ -91,7 +91,14 @@ object SparkSubmit { exitFn() } private[spark] def printVersionAndExit() = { - printStream.println(s"Spark Version: ${spark.SPARK_VERSION}") + printStream.println("""Welcome to + ____ __ + / __/__ ___ _____/ /__ + _\ \/ _ \/ _ `/ __/ '_/ + /___/ .__/\_,_/_/ /_/\_\ version %s + /_/ + """.format(SPARK_VERSION)) + printStream.println("Type --help for more information.") exitFn() } diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index cb61e55e14183..82e66a374249c 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -413,11 +413,11 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St case ("--help" | "-h") :: tail => printUsageAndExit(0) - case ("--verbose") :: tail => + case ("--verbose" | "-v") :: tail => verbose = true parse(tail) - case ("--version" | "-v") :: tail => + case ("--version") :: tail => SparkSubmit.printVersionAndExit() case EQ_SEPARATED_OPT(opt, value) :: tail => @@ -487,8 +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, Print additional debug output - | --version, -v Print the version of current Spark + | --verbose, -v Print additional debug output + | --version, Print the version of current Spark | | Spark standalone with cluster deploy mode only: | --driver-cores NUM Cores for driver (Default: 1).