dd95ba8937
- kvm-net-Fix-announce_self.patch [RHEL-73891] - kvm-migration-Add-helper-to-get-target-runstate.patch [RHEL-54296 RHEL-78397] - kvm-qmp-cont-Only-activate-disks-if-migration-completed.patch [RHEL-54296 RHEL-78397] - kvm-migration-block-Make-late-block-active-the-default.patch [RHEL-54296 RHEL-78397] - kvm-migration-block-Apply-late-block-active-behavior-to-.patch [RHEL-54296 RHEL-78397] - kvm-migration-block-Fix-possible-race-with-block_inactiv.patch [RHEL-54296 RHEL-78397] - kvm-migration-block-Rewrite-disk-activation.patch [RHEL-54296 RHEL-78397] - kvm-block-Add-active-field-to-BlockDeviceInfo.patch [RHEL-54296 RHEL-78397] - kvm-block-Allow-inactivating-already-inactive-nodes.patch [RHEL-54296 RHEL-78397] - kvm-block-Inactivate-external-snapshot-overlays-when-nec.patch [RHEL-54296 RHEL-78397] - kvm-migration-block-active-Remove-global-active-flag.patch [RHEL-54296 RHEL-78397] - kvm-block-Don-t-attach-inactive-child-to-active-node.patch [RHEL-54296 RHEL-78397] - kvm-block-Fix-crash-on-block_resize-on-inactive-node.patch [RHEL-54296 RHEL-78397] - kvm-block-Add-option-to-create-inactive-nodes.patch [RHEL-54296 RHEL-78397] - kvm-block-Add-blockdev-set-active-QMP-command.patch [RHEL-54296 RHEL-78397] - kvm-block-Support-inactive-nodes-in-blk_insert_bs.patch [RHEL-54296 RHEL-78397] - kvm-block-export-Don-t-ignore-image-activation-error-in-.patch [RHEL-54296 RHEL-78397] - kvm-block-Drain-nodes-before-inactivating-them.patch [RHEL-54296 RHEL-78397] - kvm-block-export-Add-option-to-allow-export-of-inactive-.patch [RHEL-54296 RHEL-78397] - kvm-nbd-server-Support-inactive-nodes.patch [RHEL-54296 RHEL-78397] - kvm-iotests-Add-filter_qtest.patch [RHEL-54296 RHEL-78397] - kvm-iotests-Add-qsd-migrate-case.patch [RHEL-54296 RHEL-78397] - kvm-iotests-Add-NBD-based-tests-for-inactive-nodes.patch [RHEL-54296 RHEL-78397] - Resolves: RHEL-73891 (No RARP packets on the destination after migration [rhel-9.6]) - Resolves: RHEL-54296 (Provide QMP command for block device reactivation after migration [rhel-9.5]) - Resolves: RHEL-78397 (backport fix for double migration of a paused VM (disk activation rewrite))
245 lines
9.8 KiB
Diff
245 lines
9.8 KiB
Diff
From 21587defa46a2862be2322b6433dde23b7a9a5c9 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Tue, 4 Feb 2025 22:14:06 +0100
|
|
Subject: [PATCH 22/23] iotests: Add qsd-migrate case
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 339: QMP command for block device reactivation after migration
|
|
RH-Jira: RHEL-54296 RHEL-78397
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Commit: [21/22] 5467d4c29cf44bf1ad7bf3068baef0c0b4ee05ce (kmwolf/centos-qemu-kvm)
|
|
|
|
Test that it's possible to migrate a VM that uses an image on shared
|
|
storage through qemu-storage-daemon.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Acked-by: Fabiano Rosas <farosas@suse.de>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Message-ID: <20250204211407.381505-16-kwolf@redhat.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit 3ea437ab3d561ca79b95a34c5128e370de4738e3)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
tests/qemu-iotests/tests/qsd-migrate | 140 +++++++++++++++++++++++
|
|
tests/qemu-iotests/tests/qsd-migrate.out | 59 ++++++++++
|
|
2 files changed, 199 insertions(+)
|
|
create mode 100755 tests/qemu-iotests/tests/qsd-migrate
|
|
create mode 100644 tests/qemu-iotests/tests/qsd-migrate.out
|
|
|
|
diff --git a/tests/qemu-iotests/tests/qsd-migrate b/tests/qemu-iotests/tests/qsd-migrate
|
|
new file mode 100755
|
|
index 0000000000..de17562cb0
|
|
--- /dev/null
|
|
+++ b/tests/qemu-iotests/tests/qsd-migrate
|
|
@@ -0,0 +1,140 @@
|
|
+#!/usr/bin/env python3
|
|
+# group: rw quick
|
|
+#
|
|
+# Copyright (C) Red Hat, Inc.
|
|
+#
|
|
+# This program is free software; you can redistribute it and/or modify
|
|
+# it under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation; either version 2 of the License, or
|
|
+# (at your option) any later version.
|
|
+#
|
|
+# This program is distributed in the hope that it will be useful,
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+# GNU General Public License for more details.
|
|
+#
|
|
+# You should have received a copy of the GNU General Public License
|
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
+#
|
|
+# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
|
|
+
|
|
+import iotests
|
|
+
|
|
+from iotests import filter_qemu_io, filter_qtest
|
|
+
|
|
+iotests.script_initialize(supported_fmts=['generic'],
|
|
+ supported_protocols=['file'],
|
|
+ supported_platforms=['linux'])
|
|
+
|
|
+with iotests.FilePath('disk.img') as path, \
|
|
+ iotests.FilePath('nbd-src.sock', base_dir=iotests.sock_dir) as nbd_src, \
|
|
+ iotests.FilePath('nbd-dst.sock', base_dir=iotests.sock_dir) as nbd_dst, \
|
|
+ iotests.FilePath('migrate.sock', base_dir=iotests.sock_dir) as mig_sock, \
|
|
+ iotests.VM(path_suffix="-src") as vm_src, \
|
|
+ iotests.VM(path_suffix="-dst") as vm_dst:
|
|
+
|
|
+ img_size = '10M'
|
|
+
|
|
+ iotests.log('Preparing disk...')
|
|
+ iotests.qemu_img_create('-f', iotests.imgfmt, path, img_size)
|
|
+
|
|
+ iotests.log('Launching source QSD...')
|
|
+ qsd_src = iotests.QemuStorageDaemon(
|
|
+ '--blockdev', f'file,node-name=disk-file,filename={path}',
|
|
+ '--blockdev', f'{iotests.imgfmt},file=disk-file,node-name=disk-fmt',
|
|
+ '--nbd-server', f'addr.type=unix,addr.path={nbd_src}',
|
|
+ '--export', 'nbd,id=exp0,node-name=disk-fmt,writable=true,'
|
|
+ 'allow-inactive=true',
|
|
+ qmp=True,
|
|
+ )
|
|
+
|
|
+ iotests.log('Launching source VM...')
|
|
+ vm_src.add_args('-blockdev', f'nbd,node-name=disk,server.type=unix,'
|
|
+ f'server.path={nbd_src},export=disk-fmt')
|
|
+ vm_src.add_args('-device', 'virtio-blk,drive=disk,id=virtio0')
|
|
+ vm_src.launch()
|
|
+
|
|
+ iotests.log('Launching destination QSD...')
|
|
+ qsd_dst = iotests.QemuStorageDaemon(
|
|
+ '--blockdev', f'file,node-name=disk-file,filename={path},active=off',
|
|
+ '--blockdev', f'{iotests.imgfmt},file=disk-file,node-name=disk-fmt,'
|
|
+ f'active=off',
|
|
+ '--nbd-server', f'addr.type=unix,addr.path={nbd_dst}',
|
|
+ '--export', 'nbd,id=exp0,node-name=disk-fmt,writable=true,'
|
|
+ 'allow-inactive=true',
|
|
+ qmp=True,
|
|
+ instance_id='b',
|
|
+ )
|
|
+
|
|
+ iotests.log('Launching destination VM...')
|
|
+ vm_dst.add_args('-blockdev', f'nbd,node-name=disk,server.type=unix,'
|
|
+ f'server.path={nbd_dst},export=disk-fmt')
|
|
+ vm_dst.add_args('-device', 'virtio-blk,drive=disk,id=virtio0')
|
|
+ vm_dst.add_args('-incoming', f'unix:{mig_sock}')
|
|
+ vm_dst.launch()
|
|
+
|
|
+ iotests.log('\nTest I/O on the source')
|
|
+ vm_src.hmp_qemu_io('virtio0/virtio-backend', 'write -P 0x11 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+ vm_src.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+
|
|
+ iotests.log('\nStarting migration...')
|
|
+
|
|
+ mig_caps = [
|
|
+ {'capability': 'events', 'state': True},
|
|
+ {'capability': 'pause-before-switchover', 'state': True},
|
|
+ ]
|
|
+ vm_src.qmp_log('migrate-set-capabilities', capabilities=mig_caps)
|
|
+ vm_dst.qmp_log('migrate-set-capabilities', capabilities=mig_caps)
|
|
+ vm_src.qmp_log('migrate', uri=f'unix:{mig_sock}',
|
|
+ filters=[iotests.filter_qmp_testfiles])
|
|
+
|
|
+ vm_src.event_wait('MIGRATION',
|
|
+ match={'data': {'status': 'pre-switchover'}})
|
|
+
|
|
+ iotests.log('\nPre-switchover: Reconfigure QSD instances')
|
|
+
|
|
+ iotests.log(qsd_src.qmp('blockdev-set-active', {'active': False}))
|
|
+
|
|
+ # Reading is okay from both sides while the image is inactive. Note that
|
|
+ # the destination may have stale data until it activates the image, though.
|
|
+ vm_src.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+ vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'read 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+
|
|
+ iotests.log(qsd_dst.qmp('blockdev-set-active', {'active': True}))
|
|
+
|
|
+ iotests.log('\nCompleting migration...')
|
|
+
|
|
+ vm_src.qmp_log('migrate-continue', state='pre-switchover')
|
|
+ vm_dst.event_wait('MIGRATION', match={'data': {'status': 'completed'}})
|
|
+
|
|
+ iotests.log('\nTest I/O on the destination')
|
|
+
|
|
+ # Now the destination must see what the source wrote
|
|
+ vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+
|
|
+ # And be able to overwrite it
|
|
+ vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'write -P 0x22 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+ vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x22 0 4k',
|
|
+ use_log=True, qdev=True)
|
|
+
|
|
+ iotests.log('\nDone')
|
|
+
|
|
+ vm_src.shutdown()
|
|
+ iotests.log('\n--- vm_src log ---')
|
|
+ log = vm_src.get_log()
|
|
+ if log:
|
|
+ iotests.log(log, [filter_qtest, filter_qemu_io])
|
|
+ qsd_src.stop()
|
|
+
|
|
+ vm_dst.shutdown()
|
|
+ iotests.log('\n--- vm_dst log ---')
|
|
+ log = vm_dst.get_log()
|
|
+ if log:
|
|
+ iotests.log(log, [filter_qtest, filter_qemu_io])
|
|
+ qsd_dst.stop()
|
|
diff --git a/tests/qemu-iotests/tests/qsd-migrate.out b/tests/qemu-iotests/tests/qsd-migrate.out
|
|
new file mode 100644
|
|
index 0000000000..4a5241e5d4
|
|
--- /dev/null
|
|
+++ b/tests/qemu-iotests/tests/qsd-migrate.out
|
|
@@ -0,0 +1,59 @@
|
|
+Preparing disk...
|
|
+Launching source QSD...
|
|
+Launching source VM...
|
|
+Launching destination QSD...
|
|
+Launching destination VM...
|
|
+
|
|
+Test I/O on the source
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"write -P 0x11 0 4k\""}}
|
|
+{"return": ""}
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"read -P 0x11 0 4k\""}}
|
|
+{"return": ""}
|
|
+
|
|
+Starting migration...
|
|
+{"execute": "migrate-set-capabilities", "arguments": {"capabilities": [{"capability": "events", "state": true}, {"capability": "pause-before-switchover", "state": true}]}}
|
|
+{"return": {}}
|
|
+{"execute": "migrate-set-capabilities", "arguments": {"capabilities": [{"capability": "events", "state": true}, {"capability": "pause-before-switchover", "state": true}]}}
|
|
+{"return": {}}
|
|
+{"execute": "migrate", "arguments": {"uri": "unix:SOCK_DIR/PID-migrate.sock"}}
|
|
+{"return": {}}
|
|
+
|
|
+Pre-switchover: Reconfigure QSD instances
|
|
+{"return": {}}
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"read -P 0x11 0 4k\""}}
|
|
+{"return": ""}
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"read 0 4k\""}}
|
|
+{"return": ""}
|
|
+{"return": {}}
|
|
+
|
|
+Completing migration...
|
|
+{"execute": "migrate-continue", "arguments": {"state": "pre-switchover"}}
|
|
+{"return": {}}
|
|
+
|
|
+Test I/O on the destination
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"read -P 0x11 0 4k\""}}
|
|
+{"return": ""}
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"write -P 0x22 0 4k\""}}
|
|
+{"return": ""}
|
|
+{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-io -d virtio0/virtio-backend \"read -P 0x22 0 4k\""}}
|
|
+{"return": ""}
|
|
+
|
|
+Done
|
|
+
|
|
+--- vm_src log ---
|
|
+wrote 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
+read 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
+read 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
+
|
|
+--- vm_dst log ---
|
|
+read 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
+read 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
+wrote 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
+read 4096/4096 bytes at offset 0
|
|
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
--
|
|
2.48.1
|
|
|