openstack/nova
Code Issues Proposed changes

Merge "numa: remove the redundant check for hw_cpu/hw_mem list"

Browse Source
This commit is contained in:
Jenkins 2016-07-29 21:55:55 +00:00 committed by Gerrit Code Review
commit ae3d464f4e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/virt/hardware.py
View File

@ -981,7 +981,6 @@ def _numa_get_pagesize_constraints(flavor, image_meta):
def _numa_get_flavor_cpu_map_list(flavor): def _numa_get_flavor_cpu_map_list(flavor):
hw_numa_cpus = [] hw_numa_cpus = []
hw_numa_cpus_set = False
extra_specs = flavor.get("extra_specs", {}) extra_specs = flavor.get("extra_specs", {})
for cellid in range(objects.ImageMetaProps.NUMA_NODES_MAX): for cellid in range(objects.ImageMetaProps.NUMA_NODES_MAX):
cpuprop = "hw:numa_cpus.%d" % cellid cpuprop = "hw:numa_cpus.%d" % cellid
@ -989,9 +988,8 @@ def _numa_get_flavor_cpu_map_list(flavor):
break break
hw_numa_cpus.append( hw_numa_cpus.append(
parse_cpu_spec(extra_specs[cpuprop])) parse_cpu_spec(extra_specs[cpuprop]))
hw_numa_cpus_set = True
if hw_numa_cpus_set: if hw_numa_cpus:
return hw_numa_cpus return hw_numa_cpus
@ -1010,16 +1008,14 @@ def _numa_get_cpu_map_list(flavor, image_meta):
def _numa_get_flavor_mem_map_list(flavor): def _numa_get_flavor_mem_map_list(flavor):
hw_numa_mem = [] hw_numa_mem = []
hw_numa_mem_set = False
extra_specs = flavor.get("extra_specs", {}) extra_specs = flavor.get("extra_specs", {})
for cellid in range(objects.ImageMetaProps.NUMA_NODES_MAX): for cellid in range(objects.ImageMetaProps.NUMA_NODES_MAX):
memprop = "hw:numa_mem.%d" % cellid memprop = "hw:numa_mem.%d" % cellid
if memprop not in extra_specs: if memprop not in extra_specs:
break break
hw_numa_mem.append(int(extra_specs[memprop])) hw_numa_mem.append(int(extra_specs[memprop]))
hw_numa_mem_set = True
if hw_numa_mem_set: if hw_numa_mem:
return hw_numa_mem return hw_numa_mem