openstack
/
nova
Code Issues Proposed changes

fix up numa-topology live migration hypervisor check 

It turns out that even when KVM is supported by qemu the libvirt
driver will report the hypervisor type as "QEMU".  So we need to
fix up the hypervisor type check in the live migration code that
checks whether the instance has a NUMA topology.

Closes-Bug: #1818092
Change-Id: I5127227a1e3d76dd413a820b048547ba578aff6b
Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
(cherry picked from commit 4da0587233)
(cherry picked from commit ecdf3c67ee)
This commit is contained in:
Chris Friesen 2019-02-06 14:57:12 -06:00 committed by Matt Riedemann
parent 9999bce00f
commit 9cbd2aedde
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/conductor/tasks/live_migrate.py
View File

@ -152,7 +152,10 @@ class LiveMigrationTask(base.TaskBase):
# HyperV's vNUMA feature doesn't allow specific pinning
hypervisor_type = objects.ComputeNode.get_by_host_and_nodename(
self.context, self.source, self.instance.node).hypervisor_type
if hypervisor_type != obj_fields.HVType.KVM:
# KVM is not a hypervisor, so when using a virt_type of "kvm" the
# hypervisor_type will still be "QEMU".
if hypervisor_type.lower() != obj_fields.HVType.QEMU:
return
msg = ('Instance has an associated NUMA topology. '

2
nova/tests/unit/conductor/tasks/test_live_migrate.py
View File

@ -210,7 +210,7 @@ class LiveMigrationTaskTestCase(test.NoDBTestCase):
def test_check_instance_has_no_numa_fails(self, mock_get):
self.flags(enable_numa_live_migration=False, group='workarounds')
mock_get.return_value = objects.ComputeNode(
uuid=uuids.cn1, hypervisor_type='kvm')
uuid=uuids.cn1, hypervisor_type='QEMU')
self.task.instance.numa_topology = objects.InstanceNUMATopology(
cells=[objects.InstanceNUMACell(id=0, cpuset=set([0]),
memory=1024)])