Skip to content

Synchronise wallaby with upstream #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2023
Merged

Synchronise wallaby with upstream #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5ea5f1
Improving logging at '_allocate_mdevs'.
jsanemet Oct 11, 2022
d6a296e
Merge "Improving logging at '_allocate_mdevs'." into stable/wallaby
Mar 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions nova/virt/libvirt/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7815,6 +7815,7 @@ def _get_existing_mdevs_not_assigned(self, parent, requested_types=None):
:param requested_types: Filter out the result for only mediated devices
having those types.
"""
LOG.debug('Searching for available mdevs...')
allocated_mdevs = self._get_all_assigned_mediated_devices()
mdevs = self._get_mediated_devices(requested_types)
available_mdevs = set()
Expand All @@ -7830,6 +7831,7 @@ def _get_existing_mdevs_not_assigned(self, parent, requested_types=None):
available_mdevs.add(mdev["uuid"])

available_mdevs -= set(allocated_mdevs)
LOG.info('Available mdevs at: %s.', available_mdevs)
return available_mdevs

def _create_new_mediated_device(self, parent, uuid=None):
Expand All @@ -7841,6 +7843,7 @@ def _create_new_mediated_device(self, parent, uuid=None):

:returns: the newly created mdev UUID or None if not possible
"""
LOG.debug('Attempting to create new mdev...')
supported_types = self.supported_vgpu_types
# Try to see if we can still create a new mediated device
devices = self._get_mdev_capable_devices(supported_types)
Expand All @@ -7852,6 +7855,7 @@ def _create_new_mediated_device(self, parent, uuid=None):
# The device is not the one that was called, not creating
# the mdev
continue
LOG.debug('Trying on: %s.', dev_name)
dev_supported_type = self._get_vgpu_type_per_pgpu(dev_name)
if dev_supported_type and device['types'][
dev_supported_type]['availableInstances'] > 0:
Expand All @@ -7861,7 +7865,13 @@ def _create_new_mediated_device(self, parent, uuid=None):
pci_addr = "{}:{}:{}.{}".format(*dev_name[4:].split('_'))
chosen_mdev = nova.privsep.libvirt.create_mdev(
pci_addr, dev_supported_type, uuid=uuid)
LOG.info('Created mdev: %s on pGPU: %s.',
chosen_mdev, pci_addr)
return chosen_mdev
LOG.debug('Failed: No available instances on device.')
LOG.info('Failed to create mdev. '
'No free space found among the following devices: %s.',
[dev['dev_id'] for dev in devices])

@utils.synchronized(VGPU_RESOURCE_SEMAPHORE)
def _allocate_mdevs(self, allocations):
Expand Down Expand Up @@ -7943,13 +7953,16 @@ def _allocate_mdevs(self, allocations):
# Take the first available mdev
chosen_mdev = mdevs_available.pop()
else:
LOG.debug('No available mdevs where found. '
'Creating an new one...')
chosen_mdev = self._create_new_mediated_device(parent_device)
if not chosen_mdev:
# If we can't find devices having available VGPUs, just raise
raise exception.ComputeResourcesUnavailable(
reason='vGPU resource is not available')
else:
chosen_mdevs.append(chosen_mdev)
LOG.info('Allocated mdev: %s.', chosen_mdev)
return chosen_mdevs

def _detach_mediated_devices(self, guest):
Expand Down