openstack/nova
Code Issues Proposed changes

Merge "objects: remove cpu_topology from __init__ of InstanceNUMATopology"

Browse Source
This commit is contained in:
Jenkins
2017-05-17 12:53:40 +00:00
committed by Gerrit Code Review
parent 1a643bf934 99f3bbc1ac
commit 01b1357e30
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/virt/hardware.py
View File

@@ -571,7 +571,8 @@ def _get_desirable_cpu_topologies(flavor, image_meta, allow_threads=True,
if numa_topology:
min_requested_threads = None
cell_topologies = [cell.cpu_topology for cell in numa_topology.cells
if cell.cpu_topology]
if ('cpu_topology' in cell
and cell.cpu_topology)]
if cell_topologies:
min_requested_threads = min(
topo.threads for topo in cell_topologies)
@@ -1693,6 +1694,7 @@ def instance_topology_from_instance(instance):
cpuset=set(cell['cpuset']),
memory=cell['memory'],
pagesize=cell.get('pagesize'),
cpu_topology=cell.get('cpu_topology'),
cpu_pinning=cell.get('cpu_pinning_raw'),
cpu_policy=cell.get('cpu_policy'),
cpu_thread_policy=cell.get('cpu_thread_policy'),