From ab7c62d57300c4033292d06ba840dad02f5552d7 Mon Sep 17 00:00:00 2001
From: Aaron Davidson <aaron@databricks.com>
Date: Tue, 3 Jun 2014 22:33:04 -0700
Subject: [PATCH] Update spark-ec2 scripts for 1.0.0 on master
The change was previously committed only to branch-1.0 as part of https://github.com/apache/spark/commit/a34e6fda1d6fb8e769c21db70845f1a6dde968d8
Author: Aaron Davidson <aaron@databricks.com>
This patch had conflicts when merged, resolved by
Committer: Patrick Wendell <pwendell@gmail.com>
Closes #938 from aarondav/sparkec2 and squashes the following commits:
067cc31 [Aaron Davidson] Update spark-ec2 scripts for 1.0.0 on master
---
ec2/spark_ec2.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 8b056f5ea7..3af9f66e17 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -83,7 +83,7 @@ def parse_args():
"between zones applies)")
parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use")
parser.add_option(
- "-v", "--spark-version", default="0.9.1",
+ "-v", "--spark-version", default="1.0.0",
help="Version of Spark to use: 'X.Y.Z' or a specific git hash")
parser.add_option(
"--spark-git-repo",
@@ -191,7 +191,8 @@ 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", "0.9.1": "0.9.1"
+ "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",
+ "1.0.0": "1.0.0"
}
version = opts.spark_version.replace("v", "")
if version not in spark_shark_map:
@@ -199,7 +200,6 @@ def get_spark_shark_version(opts):
sys.exit(1)
return (version, spark_shark_map[version])
-
# Attempt to resolve an appropriate AMI given the architecture and
# region of the request.
def get_spark_ami(opts):
--
GitLab