Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-6444. Support additional security group option in hadoop-ec2 script. Contributed by Paul Egan. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@893251 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2009-12-22 18:06:02 +00:00
parent 3d3e1ff3f8
commit d2bae8756c
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -73,6 +73,9 @@ Trunk (unreleased changes)
HADOOP-4656. Add a user to groups mapping service. (boryas, acmurthy)
HADOOP-6444. Support additional security group option in hadoop-ec2 script.
(Paul Egan via tomwhite)
OPTIMIZATIONS
BUG FIXES

18
src/contrib/cloud/src/py/hadoop/cloud/cli.py
View File

@ -84,6 +84,9 @@ automatically shut down."),
make_option("--client-cidr", metavar="CIDR", action="append",
help="The CIDR of the client, which is used to allow access through the \
firewall to the master node. (May be specified multiple times.)"),
make_option("--security-group", metavar="SECURITY_GROUP", action="append",
default=[], help="Additional security groups within which the instances \
should be run. (Amazon EC2 only.) (May be specified multiple times.)"),
make_option("--public-key", metavar="FILE",
help="The public key to authorize on launching instances. (Non-EC2 \
providers only.)"),
@ -282,7 +285,8 @@ def main():
opt.get('instance_type'), opt.get('key_name'),
opt.get('public_key'), opt.get('user_data_file'),
opt.get('availability_zone'), opt.get('user_packages'),
opt.get('auto_shutdown'), opt.get('env'))
opt.get('auto_shutdown'), opt.get('env'),
opt.get('security_group'))
service.launch_master(template, config_dir, opt.get('client_cidr'))
elif command == 'launch-slaves':
@ -295,7 +299,8 @@ def main():
opt.get('instance_type'), opt.get('key_name'),
opt.get('public_key'), opt.get('user_data_file'),
opt.get('availability_zone'), opt.get('user_packages'),
opt.get('auto_shutdown'), opt.get('env'))
opt.get('auto_shutdown'), opt.get('env'),
opt.get('security_group'))
service.launch_slaves(template)
elif command == 'launch-cluster':
@ -315,13 +320,15 @@ def main():
opt.get('instance_type'), opt.get('key_name'),
opt.get('public_key'), opt.get('user_data_file'),
opt.get('availability_zone'), opt.get('user_packages'),
opt.get('auto_shutdown'), opt.get('env')),
opt.get('auto_shutdown'), opt.get('env'),
opt.get('security_group')),
InstanceTemplate((DATANODE, TASKTRACKER), number_of_slaves,
get_image_id(service.cluster, opt),
opt.get('instance_type'), opt.get('key_name'),
opt.get('public_key'), opt.get('user_data_file'),
opt.get('availability_zone'), opt.get('user_packages'),
opt.get('auto_shutdown'), opt.get('env')),
opt.get('auto_shutdown'), opt.get('env'),
opt.get('security_group')),
]
elif len(args) > 2 and len(args) % 2 == 0:
print_usage(sys.argv[0])
@ -336,7 +343,8 @@ def main():
opt.get('public_key'), opt.get('user_data_file'),
opt.get('availability_zone'),
opt.get('user_packages'),
opt.get('auto_shutdown'), opt.get('env')))
opt.get('auto_shutdown'), opt.get('env'),
opt.get('security_group')))
service.launch_cluster(instance_templates, config_dir,
opt.get('client_cidr'))

3
src/contrib/cloud/src/py/hadoop/cloud/providers/ec2.py
View File

@ -221,10 +221,11 @@ class Ec2Cluster(Cluster):
self._create_groups(role)
user_data = instance_user_data.read_as_gzip_stream()
security_groups = self._get_group_names(roles) + kwargs.get('security_groups', [])
reservation = self.ec2Connection.run_instances(image_id, min_count=number,
max_count=number, key_name=kwargs.get('key_name', None),
security_groups=self._get_group_names(roles), user_data=user_data,
security_groups=security_groups, user_data=user_data,
instance_type=size_id, placement=kwargs.get('placement', None))
return [instance.id for instance in reservation.instances]

7
src/contrib/cloud/src/py/hadoop/cloud/service.py
View File

@ -51,7 +51,8 @@ class InstanceTemplate(object):
def __init__(self, roles, number, image_id, size_id,
key_name, public_key,
user_data_file_template=None, placement=None,
user_packages=None, auto_shutdown=None, env_strings=[]):
user_packages=None, auto_shutdown=None, env_strings=[],
security_groups=[]):
self.roles = roles
self.number = number
self.image_id = image_id
@ -63,6 +64,7 @@ class InstanceTemplate(object):
self.user_packages = user_packages
self.auto_shutdown = auto_shutdown
self.env_strings = env_strings
self.security_groups = security_groups
def add_env_strings(self, env_strings):
new_env_strings = list(self.env_strings or [])
@ -307,7 +309,8 @@ echo Proxy pid %s;""" % (process.pid, process.pid)
instance_user_data,
key_name=it.key_name,
public_key=it.public_key,
placement=it.placement)
placement=it.placement,
security_groups=it.security_groups)
print "Waiting for %s instances in role %s to start" % \
(it.number, ",".join(it.roles))
try: