openstack
/
nova
Code Issues Proposed changes

Merge "Reset task_state when resetting vm_state to ACTIVE"

This commit is contained in:
Jenkins 2013-05-24 05:29:14 +00:00 committed by Gerrit Code Review
parent b5761b0adb 7f7eeb07a8
commit 738a395eba
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/compute/manager.py
View File

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