Skip to content

Commit

Permalink
Add Spark v0.9.1 to ec2 launch script and use it as the default
Browse files Browse the repository at this point in the history
Mainly ported from branch-0.9.

Author: Harvey Feng <[email protected]>

Closes apache#385 from harveyfeng/0.9.1-ec2 and squashes the following commits:

769ac2f [Harvey Feng] Add Spark v0.9.1 to ec2 launch script and use it as the default
  • Loading branch information
harveyfeng authored and pwendell committed Apr 11, 2014
1 parent 5cd11d5 commit 7b4203a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ec2/spark_ec2.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def parse_args():
"slaves across multiple (an additional $0.01/Gb for bandwidth" +
"between zones applies)")
parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use")
parser.add_option("-v", "--spark-version", default="0.9.0",
parser.add_option("-v", "--spark-version", default="0.9.1",
help="Version of Spark to use: 'X.Y.Z' or a specific git hash")
parser.add_option("--spark-git-repo",
default="https://github.com/apache/spark",
Expand Down Expand Up @@ -157,7 +157,7 @@ def is_active(instance):

# Return correct versions of Spark and Shark, given the supplied Spark version
def get_spark_shark_version(opts):
spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0"}
spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1"}
version = opts.spark_version.replace("v", "")
if version not in spark_shark_map:
print >> stderr, "Don't know about Spark version: %s" % version
Expand Down

0 comments on commit 7b4203a

Please sign in to comment.