openstack
/
nova
Code Issues Proposed changes

Merge "Rename '_numa_get_constraints_XXX' functions"

This commit is contained in:
Zuul 2018-03-21 23:58:01 +00:00 committed by Gerrit Code Review
parent 06ad7dffa6 0e7e3e18c7
commit 42c369223d
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nova/virt/hardware.py
View File

@ -1182,7 +1182,25 @@ def _get_cpu_thread_policy_constraints(flavor, image_meta):
return policy
def _numa_get_constraints_manual(nodes, flavor, cpu_list, mem_list):
def _get_numa_topology_auto(nodes, flavor):
if ((flavor.vcpus % nodes) > 0 or
(flavor.memory_mb % nodes) > 0):
raise exception.ImageNUMATopologyAsymmetric()
cells = []
for node in range(nodes):
ncpus = int(flavor.vcpus / nodes)
mem = int(flavor.memory_mb / nodes)
start = node * ncpus
cpuset = set(range(start, start + ncpus))
cells.append(objects.InstanceNUMACell(
id=node, cpuset=cpuset, memory=mem))
return objects.InstanceNUMATopology(cells=cells)
def _get_numa_topology_manual(nodes, flavor, cpu_list, mem_list):
cells = []
totalmem = 0
@ -1247,24 +1265,6 @@ def vcpus_realtime_topology(flavor, image):
return vcpus_rt
def _numa_get_constraints_auto(nodes, flavor):
if ((flavor.vcpus % nodes) > 0 or
(flavor.memory_mb % nodes) > 0):
raise exception.ImageNUMATopologyAsymmetric()
cells = []
for node in range(nodes):
ncpus = int(flavor.vcpus / nodes)
mem = int(flavor.memory_mb / nodes)
start = node * ncpus
cpuset = set(range(start, start + ncpus))
cells.append(objects.InstanceNUMACell(
id=node, cpuset=cpuset, memory=mem))
return objects.InstanceNUMATopology(cells=cells)
def get_emulator_threads_constraint(flavor, image_meta):
"""Determines the emulator threads policy"""
emu_threads_policy = flavor.get('extra_specs', {}).get(
@ -1378,10 +1378,10 @@ def numa_get_constraints(flavor, image_meta):
raise exception.ImageNUMATopologyIncomplete()
if cpu_list is None:
numa_topology = _numa_get_constraints_auto(
numa_topology = _get_numa_topology_auto(
nodes, flavor)
else:
numa_topology = _numa_get_constraints_manual(
numa_topology = _get_numa_topology_manual(
nodes, flavor, cpu_list, mem_list)
# We currently support same pagesize for all cells.