diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-16 05:41:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-16 05:41:07 +0000 |
| commit | c6d1abd62a4fc26f8cd8cf52af6f2e828e0b0d22 (patch) | |
| tree | d66d3191482b540900dedd8d6fe823247ae48af9 | |
| parent | f417e2e635952adc213b4ff3077f007e5ad0a479 (diff) | |
| parent | 137e0d7458ff786aad339aac3f0021ee337d5290 (diff) | |
| download | nova-c6d1abd62a4fc26f8cd8cf52af6f2e828e0b0d22.tar.gz nova-c6d1abd62a4fc26f8cd8cf52af6f2e828e0b0d22.tar.xz nova-c6d1abd62a4fc26f8cd8cf52af6f2e828e0b0d22.zip | |
Merge "Issue a hard shutdown if clean fails on resize up"
| -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 b8f167105..cdfa3685f 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -743,7 +743,10 @@ class VMOps(object): total_steps=RESIZE_TOTAL_STEPS) # 3. Now power down the instance - 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=3, total_steps=RESIZE_TOTAL_STEPS) |