diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-29 21:05:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-29 21:05:55 +0000 |
| commit | dffef53503a30eab271639ce06366cec2af1ecbe (patch) | |
| tree | 86e3f2cfef8cac8ae4c0a6a38b4ccd22a992cf28 | |
| parent | 0e5b7f5f4dfc73beddce322e470622522d5c1d0e (diff) | |
| parent | b6a175664042dfd486fa6217b5e199a46dacefb6 (diff) | |
| download | nova-dffef53503a30eab271639ce06366cec2af1ecbe.tar.gz nova-dffef53503a30eab271639ce06366cec2af1ecbe.tar.xz nova-dffef53503a30eab271639ce06366cec2af1ecbe.zip | |
Merge "Destroy VM before VDIs during spawn cleanup"
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index bc3f03ef3..29ee1747f 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -200,6 +200,7 @@ class VMOps(object): def spawn(self, context, instance, image_meta, network_info): vdis = None + vm_ref = None try: # 1. Vanity Step # NOTE(sirp): _create_disk will potentially take a *very* long @@ -249,7 +250,7 @@ class VMOps(object): instance.uuid) LOG.debug(_('Instance %s failed to spawn - performing clean-up'), instance.id) - self._handle_spawn_error(vdis, spawn_error) + self._handle_spawn_error(instance, vm_ref, vdis, spawn_error) raise spawn_error def spawn_rescue(self, context, instance, image_meta, network_info): @@ -524,7 +525,11 @@ class VMOps(object): no_agent = version is None self._configure_instance(ctx, instance, vm_ref, no_agent) - def _handle_spawn_error(self, vdis, spawn_error): + def _handle_spawn_error(self, instance, vm_ref, vdis, spawn_error): + if vm_ref: + self._shutdown(instance, vm_ref) + self._destroy_vm(instance, vm_ref) + # Extract resource list from spawn_error. resources = [] if spawn_error.args: |