From 065b7d2cf506344e63fc7ab47a42838adac389e9 Mon Sep 17 00:00:00 2001 From: "Allan Douglas R. de Oliveira" Date: Sun, 31 Aug 2014 17:10:37 -0300 Subject: [PATCH] Also use the group name as machine membership and other small cleanups --- ec2/spark_ec2.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index ae4c488f83abd..b1862ab04998e 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -508,10 +508,16 @@ def get_existing_cluster(conn, opts, cluster_name, die_on_error=True): for res in reservations: active = [i for i in res.instances if is_active(i)] for inst in active: + group_names = [g.name for g in inst.groups] name = inst.tags.get(u'Name', "") - if name.startswith(cluster_name + "-master"): + master_name = cluster_name + "-master" + slave_name = cluster_name + "-slave" + # Check by tag name is required when --security-group-prefix flag is used + # but it's not failsafe, so also check by group name + # which is a more solid strategy in the general case + if name.startswith(master_name) or master_name in group_names: master_nodes.append(inst) - elif name.startswith(cluster_name + "-slave"): + elif name.startswith(slave_name) or slave_name + 's' in group_names: slave_nodes.append(inst) if any((master_nodes, slave_nodes)): print ("Found %d master(s), %d slaves" % (len(master_nodes), len(slave_nodes))) @@ -597,7 +603,6 @@ def get_num_disks(instance_type): "m1.medium": 1, "m1.large": 2, "m1.xlarge": 4, - "t1.micro": 1, "c1.medium": 1, "c1.xlarge": 4, "m2.xlarge": 1,