openstack/nova
Code Issues Proposed changes

objects: remove cpu_topology from __init__ of InstanceNUMATopology

Browse Source 
This commit removes the initialization of cpu_topology to None when
creating object InstanceNUMATopology

Change-Id: Ibd5f0436d8ce2d819f71e6897216f67b4c978407
This commit is contained in:
Sahid Orentino Ferdjaoui
2016-12-07 08:58:14 -05:00
parent 045f08ab8a
commit 99f3bbc1ac
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/objects/instance_numa_topology.py
View File

@@ -60,9 +60,6 @@ class InstanceNUMACell(base.NovaObject,
if 'pagesize' not in kwargs: if 'pagesize' not in kwargs:
self.pagesize = None self.pagesize = None
self.obj_reset_changes(['pagesize']) self.obj_reset_changes(['pagesize'])
if 'cpu_topology' not in kwargs:
self.cpu_topology = None
self.obj_reset_changes(['cpu_topology'])
if 'cpu_pinning' not in kwargs: if 'cpu_pinning' not in kwargs:
self.cpu_pinning = None self.cpu_pinning = None
self.obj_reset_changes(['cpu_pinning_raw']) self.obj_reset_changes(['cpu_pinning_raw'])
@@ -101,7 +98,7 @@ class InstanceNUMACell(base.NovaObject,
cpu_list = sorted(list(self.cpuset)) cpu_list = sorted(list(self.cpuset))
threads = 0 threads = 0
if self.cpu_topology: if ('cpu_topology' in self) and self.cpu_topology:
threads = self.cpu_topology.threads threads = self.cpu_topology.threads
if threads == 1: if threads == 1:
threads = 0 threads = 0

6
nova/tests/unit/virt/test_hardware.py
View File

@@ -1776,10 +1776,12 @@ class HelperMethodsTestCase(test.NoDBTestCase):
cells=[ cells=[
objects.InstanceNUMACell( objects.InstanceNUMACell(
id=0, cpuset=set([0, 1]), memory=256, pagesize=2048, id=0, cpuset=set([0, 1]), memory=256, pagesize=2048,
cpu_pinning={0: 0, 1: 1}), cpu_pinning={0: 0, 1: 1},
cpu_topology=None),
objects.InstanceNUMACell( objects.InstanceNUMACell(
id=1, cpuset=set([2]), memory=256, pagesize=2048, id=1, cpuset=set([2]), memory=256, pagesize=2048,
cpu_pinning={2: 3}), cpu_pinning={2: 3},
cpu_topology=None),
]) ])
self.context = context.RequestContext('fake-user', self.context = context.RequestContext('fake-user',
'fake-project') 'fake-project')

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: if numa_topology:
min_requested_threads = None min_requested_threads = None
cell_topologies = [cell.cpu_topology for cell in numa_topology.cells 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: if cell_topologies:
min_requested_threads = min( min_requested_threads = min(
topo.threads for topo in cell_topologies) topo.threads for topo in cell_topologies)
@@ -1529,6 +1530,7 @@ def instance_topology_from_instance(instance):
cpuset=set(cell['cpuset']), cpuset=set(cell['cpuset']),
memory=cell['memory'], memory=cell['memory'],
pagesize=cell.get('pagesize'), pagesize=cell.get('pagesize'),
cpu_topology=cell.get('cpu_topology'),
cpu_pinning=cell.get('cpu_pinning_raw'), cpu_pinning=cell.get('cpu_pinning_raw'),
cpu_policy=cell.get('cpu_policy'), cpu_policy=cell.get('cpu_policy'),
cpu_thread_policy=cell.get('cpu_thread_policy')) cpu_thread_policy=cell.get('cpu_thread_policy'))