Skip to content

Commit 6907c40

Browse files
committed
hotplug_mem_migration: Support multi-host migration
Signed-off-by: Yongxue Hong <[email protected]>
1 parent 3ba9912 commit 6907c40

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

qemu/tests/cfg/hotplug_mem_migration.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@
3232
numa_test = 'numactl -m %s dd if=/dev/urandom of=/tmp/numa_test/test '
3333
numa_test += 'bs=1k count=%d && rm -rf /tmp/numa_test/'
3434
stress_args = '--cpu 4 --io 4 --vm 2 --vm-bytes 4096M'
35+
take_regular_screendumps = no # FIXME:
36+
store_vm_info = no # FIXME:
37+
nodes = node1 node2
38+
node_selectors_node1 = [{"key": "cpu_vendor_id", "operator": "eq", "values": "AuthenticAMD"}, {"key": "hostname", "operator": "contains", "values": "hp-dl385g10-04.lab.eng.pek2.redhat.com"}]
39+
node_selectors_node2 = [{"key": "cpu_vendor_id", "operator": "==", "values": "AuthenticAMD"}, {"key": "hostname", "operator": "contains", "values": "hp-dl385g10-05.lab.eng.pek2.redhat.com"}]
40+
pools = p1
41+
vm_node = node1
42+
mig_dest_node = node2
43+
pool_selectors_p1 = [{"key": "type", "operator": "==", "values": "nfs"}, {"key": "access.nodes", "operator": "contains", "values": ["node1", "node2"]}]
44+
image_pool_name_image1 = p1
3545
variants with_cache:
3646
- @default:
3747
- enable_dirty_ring:

qemu/tests/hotplug_mem_migration.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ def _compare_mem_size(online_mem, expect_mem_size):
7979
# do migration
8080
mig_timeout = params.get_numeric("mig_timeout", 1200, float)
8181
mig_protocol = params.get("migration_protocol", "tcp")
82-
vm.migrate(mig_timeout, mig_protocol, env=env)
82+
dst_node = params.get("mig_dest_node")
83+
vm.migrate(mig_timeout, mig_protocol, dest_host=dst_node, env=env)
8384
for target_mem in target_mems.split():
8485
hotplug_test.unplug_memory(vm, target_mem)
8586
hotplug_test.check_memory(vm)

0 commit comments

Comments
 (0)