From 5e209a116a27c492c3b411b073f083d9422c5418 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 29 Aug 2012 23:01:25 -0400 Subject: [PATCH] in delete_instances(), wait until instance is destroyed until attempting to delete instance's security groups. Wait for at most 10 seconds. Executes in a separate thread so main call is not blocked --- sfa/openstack/osaggregate.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 80d82dae..6175c72a 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -21,6 +21,7 @@ from sfa.planetlab.plxrn import PlXrn from sfa.openstack.osxrn import OSXrn, hrn_to_os_slicename from sfa.rspecs.version_manager import VersionManager from sfa.openstack.security_group import SecurityGroup +from sfa.server.threadmanager import ThreadManager from sfa.util.sfalogging import logger def pubkeys_to_user_data(pubkeys): @@ -298,20 +299,31 @@ class OSAggregate: def delete_instances(self, instance_name, tenant_name): + + def _delete_security_group(instance): + security_group = instance.metadata.get('security_groups', '') + if security_group: + manager = SecurityGroup(self.driver) + timeout = 10.0 # wait a maximum of 10 seconds before forcing the security group delete + start_time = time.time() + instance_deleted = False + while instance_deleted == False and (time.time() - start_time) < timeout: + inst = self.driver.shell.nova_manager.servers.findall(id=instance.id) + if not inst: + instance_deleted = True + manager.delete_security_group(security_group) + + thread_manager = ThreadManager() self.driver.shell.nova_manager.connect(tenant=tenant_name) instances = self.driver.shell.nova_manager.servers.findall(name=instance_name) - security_group_manager = SecurityGroup(self.driver) for instance in instances: - # deleate this instance's security groups - security_group = instance.metadata.get('security_groups', '') - if security_group: - # dont delete the default security group - if security_group != 'default': - security_group_manager.delete_security_group(security_group) # destroy instance self.driver.shell.nova_manager.servers.delete(instance) + # deleate this instance's security groups + thread_manager.run(_delete_security_group, instance) return 1 + def stop_instances(self, instance_name, tenant_name): self.driver.shell.nova_manager.connect(tenant=tenant_name) instances = self.driver.shell.nova_manager.servers.findall(name=instance_name) -- 2.43.0