openstack
/
nova
Code Issues Proposed changes

Fix message for unexpected external event 

During live migration, we get vif plugged events
that we're not waiting for, and if InstanceEvents._events
is empty, pop_instance_event() will log a message about
shutting down, but the compute service isn't actually
shutting down. When it is, ComputeManager.cleanup_host()
calls cancel_all_events() which sets _events to None, so
we should only mention shutting down when _events is None.

Change-Id: Ie868273c4b9629f9b35645df5785304ebba5d64c
Closes-Bug: #1756994
(cherry picked from commit bbb668bbec)
This commit is contained in:
Matt Riedemann 2018-03-19 19:24:32 -04:00 committed by Vlad Gusev
parent a9c9285a5a
commit 91d47b11e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@ -342,7 +342,7 @@ class InstanceEvents(object):
@utils.synchronized(self._lock_name(instance))
def _pop_event():
if not self._events:
if self._events is None:
LOG.debug('Unexpected attempt to pop events during shutdown',
instance=instance)
return no_events_sentinel