Commit d89ac3cf authored by Kevin Wolf's avatar Kevin Wolf
Browse files

iotests/229: Use blkdebug to inject an error 



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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200511135825.219437-3-kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent ffa41a62

tests/qemu-iotests/229

+13 −5
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ _cleanup() 
    _cleanup_test_img

    _rm_test_img "$TEST_IMG"

    _rm_test_img "$DEST_IMG"

    rm -f "$TEST_DIR/blkdebug.conf"

}

trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -49,11 +50,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
@@ -67,11 +67,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',
@@ -90,7 +97,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"

tests/qemu-iotests/229.out

+3 −3
Original line number Diff line number Diff line 
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