Skip to content
Snippets Groups Projects
Commit 70e5b030 authored by Nicholas Chammas's avatar Nicholas Chammas Committed by Josh Rosen
Browse files

[SPARK-5628] Add version option to spark-ec2

Every proper command line tool should include a `--version` option or something similar.

This PR adds this to `spark-ec2` using the standard functionality provided by `optparse`.

One thing we don't do here is follow the Python convention of setting `__version__`, since it seems awkward given how `spark-ec2` is laid out.

Author: Nicholas Chammas <nicholas.chammas@gmail.com>

Closes #4414 from nchammas/spark-ec2-show-version and squashes the following commits:

914cab5 [Nicholas Chammas] add version info
parent d34f79c8
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,9 @@ from datetime import datetime ...@@ -39,6 +39,9 @@ from datetime import datetime
from optparse import OptionParser from optparse import OptionParser
from sys import stderr from sys import stderr
SPARK_EC2_VERSION = "1.2.0"
SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
VALID_SPARK_VERSIONS = set([ VALID_SPARK_VERSIONS = set([
"0.7.3", "0.7.3",
"0.8.0", "0.8.0",
...@@ -54,9 +57,8 @@ VALID_SPARK_VERSIONS = set([ ...@@ -54,9 +57,8 @@ VALID_SPARK_VERSIONS = set([
"1.2.0", "1.2.0",
]) ])
DEFAULT_SPARK_VERSION = "1.2.0" DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION
DEFAULT_SPARK_GITHUB_REPO = "https://github.com/apache/spark" DEFAULT_SPARK_GITHUB_REPO = "https://github.com/apache/spark"
SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
MESOS_SPARK_EC2_BRANCH = "branch-1.3" MESOS_SPARK_EC2_BRANCH = "branch-1.3"
# A URL prefix from which to fetch AMI information # A URL prefix from which to fetch AMI information
...@@ -103,12 +105,10 @@ class UsageError(Exception): ...@@ -103,12 +105,10 @@ class UsageError(Exception):
# Configure and parse our command-line arguments # Configure and parse our command-line arguments
def parse_args(): def parse_args():
parser = OptionParser( parser = OptionParser(
usage="spark-ec2 [options] <action> <cluster_name>" prog="spark-ec2",
+ "\n\n<action> can be: launch, destroy, login, stop, start, get-master, reboot-slaves", version="%prog {v}".format(v=SPARK_EC2_VERSION),
add_help_option=False) usage="%prog [options] <action> <cluster_name>\n\n"
parser.add_option( + "<action> can be: launch, destroy, login, stop, start, get-master, reboot-slaves")
"-h", "--help", action="help",
help="Show this help message and exit")
parser.add_option( parser.add_option(
"-s", "--slaves", type="int", default=1, "-s", "--slaves", type="int", default=1,
help="Number of slaves to launch (default: %default)") help="Number of slaves to launch (default: %default)")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment