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
)
This commit is contained in:
parent
7d5e0d9330
commit
ecdf3c67ee
|
@ -163,7 +163,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. '
|
||||
|
|
|
@ -221,7 +221,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)])
|
||||
|
|
Loading…
Reference in New Issue