openstack/deb-nova
Code Issues Proposed changes

Merge "Try hard shutdown if clean fails on resize down"

Browse Source
This commit is contained in:
Jenkins
2012-11-13 17:39:10 +00:00
committed by Gerrit Code Review
parent c9a2ae6bc9 2f82f39ed7
commit 083bccd34b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/virt/xenapi/vmops.py
View File

@@ -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)