diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-24 05:29:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-24 05:29:14 +0000 |
| commit | 738a395eba63b51456ce6fa5b959bb9bf032b3d4 (patch) | |
| tree | 6f9b03c2b0c16679286fa686f368b6d41277a6f1 | |
| parent | b5761b0adb5e4bff828739e3aecc4c9daf2d9c25 (diff) | |
| parent | 7f7eeb07a8f9ddb2640f429eca41d80dbac5ff2b (diff) | |
| download | nova-738a395eba63b51456ce6fa5b959bb9bf032b3d4.tar.gz nova-738a395eba63b51456ce6fa5b959bb9bf032b3d4.tar.xz nova-738a395eba63b51456ce6fa5b959bb9bf032b3d4.zip | |
Merge "Reset task_state when resetting vm_state to ACTIVE"
| -rwxr-xr-x | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 699007057..74826d8cc 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -4081,7 +4081,8 @@ class ComputeManager(manager.SchedulerDependentManager): msg = _("Setting instance back to ACTIVE after: %s") LOG.info(msg % error, instance_uuid=instance_uuid) self._instance_update(context, instance_uuid, - vm_state=vm_states.ACTIVE) + vm_state=vm_states.ACTIVE, + task_state=None) raise error.inner_exception except Exception, error: with excutils.save_and_reraise_exception(): |