From 104c8f6210bf573cf39c2a14cdb0b081baaaa3f0 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 3 Jun 2020 16:03:23 +0100 Subject: [PATCH 24/26] iotests/229: Use blkdebug to inject an error RH-Author: Kevin Wolf Message-id: <20200603160325.67506-10-kwolf@redhat.com> Patchwork-id: 97108 O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH v2 09/11] iotests/229: Use blkdebug to inject an error Bugzilla: 1778593 RH-Acked-by: Eric Blake RH-Acked-by: Max Reitz RH-Acked-by: Stefano Garzarella 229 relies on the mirror running into an I/O error when the target is smaller than the source. After changing mirror to catch this condition while starting the job, this test case won't get a job that is paused for an I/O error any more. Use blkdebug instead to inject an error. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Message-Id: <20200511135825.219437-3-kwolf@redhat.com> Reviewed-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf (cherry picked from commit d89ac3cf305b28c024a76805a84d75c0ee1e786f) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- tests/qemu-iotests/229 | 18 +++++++++++++----- tests/qemu-iotests/229.out | 6 +++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 index e18a464..511fbc0 100755 --- a/tests/qemu-iotests/229 +++ b/tests/qemu-iotests/229 @@ -32,6 +32,7 @@ _cleanup() _cleanup_qemu _cleanup_test_img rm -f "$TEST_IMG" "$DEST_IMG" + rm -f "$TEST_DIR/blkdebug.conf" } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -48,11 +49,10 @@ _supported_os Linux DEST_IMG="$TEST_DIR/d.$IMGFMT" TEST_IMG="$TEST_DIR/b.$IMGFMT" +BLKDEBUG_CONF="$TEST_DIR/blkdebug.conf" _make_test_img 2M - -# destination for mirror will be too small, causing error -TEST_IMG=$DEST_IMG _make_test_img 1M +TEST_IMG=$DEST_IMG _make_test_img 2M $QEMU_IO -c 'write 0 2M' "$TEST_IMG" | _filter_qemu_io @@ -66,11 +66,18 @@ echo echo '=== Starting drive-mirror, causing error & stop ===' echo +cat > "$BLKDEBUG_CONF" <