diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-20 19:04:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-20 19:04:59 +0000 |
| commit | b9a49ffb04cb5ae2d8c439361a3552296df02988 (patch) | |
| tree | aabad245469753ed37e8d250ee6987423eeaca41 /nova/compute | |
| parent | 72281b9f93139f5069035ef586867addb1f909f4 (diff) | |
| parent | f1d82c0d0a0ef5932bb1e25120015c1099f03d18 (diff) | |
| download | nova-b9a49ffb04cb5ae2d8c439361a3552296df02988.tar.gz | |
Merge "Filter PCI pools based on Placement allocation"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/claims.py | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/nova/compute/claims.py b/nova/compute/claims.py index 79e8f2f012..490b418081 100644 --- a/nova/compute/claims.py +++ b/nova/compute/claims.py @@ -124,7 +124,13 @@ class Claim(NopClaim): pci_requests = self._pci_requests if pci_requests.requests: stats = self.tracker.pci_tracker.stats - if not stats.support_requests(pci_requests.requests): + if not stats.support_requests( + pci_requests.requests, + # We explicitly signal that we are _after_ the scheduler made + # allocations in placement and therefore pci_requests.requests + # carry its own placement provider mapping information + provider_mapping=None, + ): return _('Claim pci failed') def _test_numa_topology(self, compute_node, limit): @@ -139,12 +145,17 @@ class Claim(NopClaim): if pci_requests.requests: pci_stats = self.tracker.pci_tracker.stats - instance_topology = ( - hardware.numa_fit_instance_to_host( - host_topology, requested_topology, - limits=limit, - pci_requests=pci_requests.requests, - pci_stats=pci_stats)) + instance_topology = hardware.numa_fit_instance_to_host( + host_topology, + requested_topology, + limits=limit, + pci_requests=pci_requests.requests, + pci_stats=pci_stats, + # We explicitly signal that we are _after_ the scheduler made + # allocations in placement and therefore pci_requests.requests + # carry its own placement provider mapping information + provider_mapping=None, + ) if requested_topology and not instance_topology: if pci_requests.requests: |