openstack
/
nova
Code Issues Proposed changes

Merge "Fix the vGPU dynamic options race"

This commit is contained in:
Zuul 2020-11-17 14:51:34 +00:00 committed by Gerrit Code Review
parent e20b1f72f3 2bd8900d9b
commit ac06267715
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24831,6 +24831,20 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
libvirt_driver.LibvirtDriver,
fake.FakeVirtAPI(), False)
@mock.patch.object(nova.conf.devices, 'register_dynamic_opts')
def test_get_supported_vgpu_types_registering_dynamic_opts(self, rdo):
self.flags(enabled_vgpu_types=['nvidia-11', 'nvidia-12'],
group='devices')
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
drvr._get_supported_vgpu_types()
# Okay below is confusing, but remember, ._get_supported_vgpu_types()
# is first called by the LibvirtDriver object creation, so when
# calling the above drvr._get_supported_vgpu_types() method, it will
# be the second time that register_dynamic_opts() will be called.
rdo.assert_has_calls([mock.call(CONF), mock.call(CONF)])
def test_get_vgpu_type_per_pgpu(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
device = 'pci_0000_84_00_0'

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

@ -6793,6 +6793,11 @@ class LibvirtDriver(driver.ComputeDriver):
if not CONF.devices.enabled_vgpu_types:
return []
# Make sure we register all the types as the compute service could
# be calling this method before init_host()
if len(CONF.devices.enabled_vgpu_types) > 1:
nova.conf.devices.register_dynamic_opts(CONF)
for vgpu_type in CONF.devices.enabled_vgpu_types:
group = getattr(CONF, 'vgpu_%s' % vgpu_type, None)
if group is None or not group.device_addresses: