openstack/nova
Code Issues Proposed changes

Merge "Better exception handling during run_instance"

Browse Source
This commit is contained in:
Jenkins 2011-12-02 19:43:09 +00:00 committed by Gerrit Code Review
commit 022295ecc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/manager.py
View File

@ -317,8 +317,8 @@ class ComputeManager(manager.SchedulerDependentManager):
network_info, block_device_info,
injected_files, admin_pass)
except:
self._deallocate_network(context, instance)
raise
with utils.save_and_reraise_exception():
self._deallocate_network(context, instance)
self._notify_about_instance_usage(instance)
except exception.InstanceNotFound:
LOG.exception(_("Instance %s not found.") % instance_uuid)