openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: log vm and task state when vif plugging times out" into stable/ocata

This commit is contained in:
Zuul 2018-04-20 17:39:20 +00:00 committed by Gerrit Code Review
parent 89977da322 a0599e438a
commit 3e13a725b4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -14602,7 +14602,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
prepare.side_effect = fake_prepare
drvr = libvirt_driver.LibvirtDriver(virtapi, False)
instance = objects.Instance(**self.test_instance)
instance = objects.Instance(vm_state=vm_states.BUILDING,
**self.test_instance)
vifs = [{'id': 'vif1', 'active': False},
{'id': 'vif2', 'active': False}]

7
nova/virt/libvirt/driver.py
View File

@ -5233,8 +5233,11 @@ class LibvirtDriver(driver.ComputeDriver):
except eventlet.timeout.Timeout:
# We never heard from Neutron
LOG.warning(_LW('Timeout waiting for vif plugging callback for '
'instance %(uuid)s'), {'uuid': instance.uuid},
instance=instance)
'instance with vm_state %(vm_state)s and '
'task_state %(task_state)s.'),
{'vm_state': instance.vm_state,
'task_state': instance.task_state},
instance=instance)
if CONF.vif_plugging_is_fatal:
self._cleanup_failed_start(context, instance, network_info,
block_device_info, guest,