openstack/nova
Code Issues Proposed changes

Merge "Don't wait for vif plug events during _hard_reboot"

Browse Source
This commit is contained in:
Zuul 2018-02-02 23:23:39 +00:00 committed by Gerrit Code Review
commit 38eb95384f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12608,7 +12608,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
block_device_info=block_device_info, mdevs=[uuids.mdev1]) block_device_info=block_device_info, mdevs=[uuids.mdev1])
mock_create_domain_and_network.assert_called_once_with(self.context, mock_create_domain_and_network.assert_called_once_with(self.context,
dummyxml, instance, network_info, dummyxml, instance, network_info,
block_device_info=block_device_info) block_device_info=block_device_info, vifs_already_plugged=True)
@mock.patch('oslo_utils.fileutils.ensure_tree') @mock.patch('oslo_utils.fileutils.ensure_tree')
@mock.patch('oslo_service.loopingcall.FixedIntervalLoopingCall') @mock.patch('oslo_service.loopingcall.FixedIntervalLoopingCall')

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

@ -2708,8 +2708,14 @@ class LibvirtDriver(driver.ComputeDriver):
# Initialize all the necessary networking, block devices and # Initialize all the necessary networking, block devices and
# start the instance. # start the instance.
# NOTE(melwitt): Pass vifs_already_plugged=True here even though we've
# unplugged vifs earlier. The behavior of neutron plug events depends
# on which vif type we're using and we are working with a stale network
# info cache here, so won't rely on waiting for neutron plug events.
# vifs_already_plugged=True means "do not wait for neutron plug events"
self._create_domain_and_network(context, xml, instance, network_info, self._create_domain_and_network(context, xml, instance, network_info,
block_device_info=block_device_info) block_device_info=block_device_info,
vifs_already_plugged=True)
self._prepare_pci_devices_for_use( self._prepare_pci_devices_for_use(
pci_manager.get_instance_pci_devs(instance, 'all')) pci_manager.get_instance_pci_devs(instance, 'all'))