diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-05 22:02:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-05 22:02:16 +0000 |
| commit | 880b491838856581a8d4ff69b4dbc17d778e7fba (patch) | |
| tree | 01ac3802b8bb016576ef936c0dcaccdbf65f4353 | |
| parent | c3cc2d7a2ab65848d0a71b4607bf95dd20f6214a (diff) | |
| parent | 0f678085fed5e10417cc95e0d84293f2cc1e2c78 (diff) | |
Merge "xenapi: place boot lock when doing soft delete"
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 5a295d194..d148ab73e 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -1145,10 +1145,12 @@ class VMOps(object): instance=instance) else: vm_utils.shutdown_vm(self._session, instance, vm_ref, hard=True) + self._acquire_bootlock(vm_ref) def restore(self, instance): """Restore the specified instance.""" vm_ref = self._get_vm_opaque_ref(instance) + self._release_bootlock(vm_ref) self._start(instance, vm_ref) def power_off(self, instance): |