From 24a7c79a64b0b76ff0962c322f610420df3a30c6 Mon Sep 17 00:00:00 2001 From: CodingCat Date: Sun, 2 Mar 2014 21:25:52 -0500 Subject: [PATCH 1/3] allow user to login into a cluster without slaves --- ec2/spark_ec2.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index b0512ca891ad6..880914e21cb3d 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -398,13 +398,11 @@ def get_existing_cluster(conn, opts, cluster_name, die_on_error=True): if any((master_nodes, slave_nodes)): print ("Found %d master(s), %d slaves" % (len(master_nodes), len(slave_nodes))) - if (master_nodes != [] and slave_nodes != []) or not die_on_error: + if master_nodes != [] or not die_on_error: return (master_nodes, slave_nodes) else: if master_nodes == [] and slave_nodes != []: print "ERROR: Could not find master in group " + cluster_name + "-master" - elif master_nodes != [] and slave_nodes == []: - print "ERROR: Could not find slaves in group " + cluster_name + "-slaves" else: print "ERROR: Could not find any existing cluster" sys.exit(1) From 9a7176963d4c55f5224458439b4c3550d23ea7f9 Mon Sep 17 00:00:00 2001 From: CodingCat Date: Mon, 3 Mar 2014 01:14:49 -0500 Subject: [PATCH 2/3] do not allow user to start 0-slave cluster --- ec2/spark_ec2.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 880914e21cb3d..94b16d6233e76 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -678,6 +678,9 @@ def real_main(): opts.zone = random.choice(conn.get_all_zones()).name if action == "launch": + if opts.slaves <= 0: + print "You have to start at least 1 slave" + sys.exit(1) if opts.resume: (master_nodes, slave_nodes) = get_existing_cluster( conn, opts, cluster_name) From 104af074a35370e8a5188b2a9251ea46c49a4278 Mon Sep 17 00:00:00 2001 From: CodingCat Date: Tue, 4 Mar 2014 01:02:39 -0500 Subject: [PATCH 3/3] output ERROR to stderr --- 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 94b16d6233e76..18e320261d495 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -402,9 +402,9 @@ def get_existing_cluster(conn, opts, cluster_name, die_on_error=True): return (master_nodes, slave_nodes) else: if master_nodes == [] and slave_nodes != []: - print "ERROR: Could not find master in group " + cluster_name + "-master" + print >> sys.stderr, "ERROR: Could not find master in group " + cluster_name + "-master" else: - print "ERROR: Could not find any existing cluster" + print >> sys.stderr, "ERROR: Could not find any existing cluster" sys.exit(1) @@ -679,7 +679,7 @@ def real_main(): if action == "launch": if opts.slaves <= 0: - print "You have to start at least 1 slave" + print >> sys.stderr, "ERROR: You have to start at least 1 slave" sys.exit(1) if opts.resume: (master_nodes, slave_nodes) = get_existing_cluster(