openstack
/
nova
Code Issues Proposed changes

Merge "Include pending task in log message on skip sync_power_state"

This commit is contained in:
Jenkins 2014-05-06 12:27:48 +00:00 committed by Gerrit Code Review
parent f9bb7be91f affbbca5af
commit 9fdc2de700
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/compute/manager.py
View File

@ -5262,7 +5262,9 @@ class ComputeManager(manager.Manager):
for db_instance in db_instances:
if db_instance['task_state'] is not None:
LOG.info(_("During sync_power_state the instance has a "
"pending task. Skip."), instance=db_instance)
"pending task (%(task)s). Skip."),
{'task': db_instance['task_state']},
instance=db_instance)
continue
# No pending tasks. Now try to figure out the real vm_power_state.
try:
@ -5323,7 +5325,9 @@ class ComputeManager(manager.Manager):
# yet. In this case, let's allow the loop to continue
# and run the state sync in a later round
LOG.info(_("During sync_power_state the instance has a "
"pending task. Skip."), instance=db_instance)
"pending task (%(task)s). Skip."),
{'task': db_instance.task_state},
instance=db_instance)
return
if vm_power_state != db_power_state: