121 lines
5.3 KiB
Diff
121 lines
5.3 KiB
Diff
From 104c8f6210bf573cf39c2a14cdb0b081baaaa3f0 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
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 <kwolf@redhat.com>
|
|
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 <eblake@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
|
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 <kwolf@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Message-Id: <20200511135825.219437-3-kwolf@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit d89ac3cf305b28c024a76805a84d75c0ee1e786f)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
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" <<EOF
|
|
+[inject-error]
|
|
+event = "write_aio"
|
|
+errno = "5"
|
|
+once = "on"
|
|
+EOF
|
|
+
|
|
_send_qemu_cmd $QEMU_HANDLE \
|
|
"{'execute': 'drive-mirror',
|
|
'arguments': {'device': 'testdisk',
|
|
'format': '$IMGFMT',
|
|
- 'target': '$DEST_IMG',
|
|
+ 'target': 'blkdebug:$BLKDEBUG_CONF:$DEST_IMG',
|
|
'sync': 'full',
|
|
'mode': 'existing',
|
|
'on-source-error': 'stop',
|
|
@@ -89,7 +96,8 @@ success_or_failure="y" _send_qemu_cmd $QEMU_HANDLE \
|
|
'arguments': { 'device': 'testdisk',
|
|
'force': true}}" \
|
|
"BLOCK_JOB_CANCELLED" "Assertion" \
|
|
- | grep -v '"BLOCK_JOB_ERROR"'
|
|
+ | grep -v '"BLOCK_JOB_ERROR"' \
|
|
+ | _filter_block_job_offset
|
|
|
|
# success, all done
|
|
echo "*** done"
|
|
diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out
|
|
index 22350d7..4de6dfa 100644
|
|
--- a/tests/qemu-iotests/229.out
|
|
+++ b/tests/qemu-iotests/229.out
|
|
@@ -1,6 +1,6 @@
|
|
QA output created by 229
|
|
Formatting 'TEST_DIR/b.IMGFMT', fmt=IMGFMT size=2097152
|
|
-Formatting 'TEST_DIR/d.IMGFMT', fmt=IMGFMT size=1048576
|
|
+Formatting 'TEST_DIR/d.IMGFMT', fmt=IMGFMT size=2097152
|
|
wrote 2097152/2097152 bytes at offset 0
|
|
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
{'execute': 'qmp_capabilities'}
|
|
@@ -8,7 +8,7 @@ wrote 2097152/2097152 bytes at offset 0
|
|
|
|
=== Starting drive-mirror, causing error & stop ===
|
|
|
|
-{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format': 'IMGFMT', 'target': 'TEST_DIR/d.IMGFMT', 'sync': 'full', 'mode': 'existing', 'on-source-error': 'stop', 'on-target-error': 'stop' }}
|
|
+{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format': 'IMGFMT', 'target': 'blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/d.IMGFMT', 'sync': 'full', 'mode': 'existing', 'on-source-error': 'stop', 'on-target-error': 'stop' }}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "testdisk"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
|
|
{"return": {}}
|
|
@@ -21,5 +21,5 @@ wrote 2097152/2097152 bytes at offset 0
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
|
|
{"return": {}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "testdisk"}}
|
|
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len": 2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len": 2097152, "offset": OFFSET, "speed": 0, "type": "mirror"}}
|
|
*** done
|
|
--
|
|
1.8.3.1
|
|
|