From 8637c021910c16625feabd587d93afa4838e68af Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Fri, 7 Jun 2013 14:54:26 -0700
Subject: [PATCH] Minor doc cleanup
---
ec2/spark_ec2.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index ff63e69d49..5c9817113a 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -157,12 +157,13 @@ def wait_for_instances(conn, instances):
def is_active(instance):
return (instance.state in ['pending', 'running', 'stopping', 'stopped'])
-# Return correct versions of Spark and Shark, given the supplied spark version
+# Return correct versions of Spark and Shark, given the supplied Spark version
def get_spark_shark_version(opts):
spark_shark_map = {"0.7.2": "0.7.0"}
version = opts.spark_version.replace("v", "")
if version not in ["latest", "0.7.2"]:
- print >> stderr, "Don't know about spark version: %s" % version
+ print >> stderr, "Don't know about Spark version: %s" % version
+ sys.exit(1)
if version == "latest":
version = LATEST_SPARK_VERSION
return (version, spark_shark_map[version])
@@ -433,6 +434,8 @@ def setup_cluster(conn, master_nodes, slave_nodes, zoo_nodes, opts, deploy_ssh_k
if not opts.old_scripts:
# NOTE: We should clone the repository before running deploy_files to
# prevent ec2-variables.sh from being overwritten
+ # TODO: Before being merged this should be replaced with the correct repo,
+ # and likely a new branch (to allow backwards compatibility).
ssh(master, opts, "rm -rf spark-ec2 && git clone https://github.com/pwendell/spark-ec2.git -b ec2-updates")
print "Deploying files to master..."
--
GitLab