From dbe9e9bbf064bf4a21b1d60e725f6d690127c548 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 29 Aug 2012 23:04:43 -0400 Subject: [PATCH 1/1] 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 | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index a4c0763e..cb40a081 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -356,6 +356,21 @@ class OSAggregate: def delete_instance(self, tenant_name, instance_name, id=None): + + 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) args = {'name': instance_name} if id: @@ -363,14 +378,10 @@ class OSAggregate: instances = self.driver.shell.nova_manager.servers.findall(**args) 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, id=None): -- 2.43.0