diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-18 18:11:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-18 18:11:49 +0000 |
| commit | 86fd2c7a5c77ea8933624d300f62e2149359d289 (patch) | |
| tree | 2c84603425f7c0ee450e1acecf485194bd29f22f /nova/compute | |
| parent | e03374725f5e8cc14a453a9c0311f563af776a76 (diff) | |
| parent | 3b4016184f83c71158d41db9a26e6043d9ae1506 (diff) | |
Merge "Makes sure compute doesn't crash on failed resume."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 384866cbe..86f41cd3c 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -463,6 +463,11 @@ class ComputeManager(manager.SchedulerDependentManager): except NotImplementedError: LOG.warning(_('Hypervisor driver does not support ' 'resume guests'), instance=instance) + except Exception: + # NOTE(vish): The instance failed to resume, so we set the + # instance to error and attempt to continue. + LOG.warning(_('Failed to resume instance'), instance=instance) + self._set_instance_error_state(context, instance['uuid']) elif drv_state == power_state.RUNNING: # VMwareAPI drivers will raise an exception |