diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-13 17:39:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-13 17:39:10 +0000 |
| commit | 083bccd34bc35dc043f17ff6ade66c64dd4bead2 (patch) | |
| tree | cbf1e0184076a9545729d9962da1839cc063f013 | |
| parent | c9a2ae6bc9efa4dc64d0720e371bdb8f3c20554b (diff) | |
| parent | 2f82f39ed7b10f052f686310a9e7e4d6d2a6ae58 (diff) | |
| download | nova-083bccd34bc35dc043f17ff6ade66c64dd4bead2.tar.gz nova-083bccd34bc35dc043f17ff6ade66c64dd4bead2.tar.xz nova-083bccd34bc35dc043f17ff6ade66c64dd4bead2.zip | |
Merge "Try hard shutdown if clean fails on resize down"
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 5d250c712..b8f167105 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -693,7 +693,10 @@ class VMOps(object): instance=instance) # 2. Power down the instance before resizing - vm_utils.clean_shutdown_vm(self._session, instance, vm_ref) + if not vm_utils.clean_shutdown_vm(self._session, instance, vm_ref): + LOG.debug(_("Clean shutdown did not complete successfully, " + "trying hard shutdown."), instance=instance) + vm_utils.hard_shutdown_vm(self._session, instance, vm_ref) self._update_instance_progress(context, instance, step=2, total_steps=RESIZE_TOTAL_STEPS) |