openstack/nova
Code Issues Proposed changes

Merge "Only call numa_fit_instance_to_host if necessary"

Browse Source
This commit is contained in:
Zuul
2018-01-27 00:16:06 +00:00
committed by Gerrit Code Review
parent 92754a0f91 dfef0a9109
commit c1c37be041
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/scheduler/host_manager.py
View File

@@ -293,11 +293,11 @@ class HostState(object):
host_numa_topology, _fmt = hardware.host_topology_and_format_from_host(
self)
instance_numa_topology = spec_obj.numa_topology
spec_obj.numa_topology = hardware.numa_fit_instance_to_host(
host_numa_topology, instance_numa_topology,
limits=self.limits.get('numa_topology'),
pci_requests=pci_requests, pci_stats=self.pci_stats)
if host_numa_topology and instance_numa_topology:
spec_obj.numa_topology = hardware.numa_fit_instance_to_host(
host_numa_topology, instance_numa_topology,
limits=self.limits.get('numa_topology'),
pci_requests=pci_requests, pci_stats=self.pci_stats)
if pci_requests:
instance_cells = None
if spec_obj.numa_topology: