Commit 054be360 authored by Eric Blake's avatar Eric Blake
Browse files

iotests: Wait for qemu to end in 223 



When iotest 223 was first written, it didn't matter if we waited for
the qemu process to clean up. But with the introduction of a later
qemu-nbd process trying to reuse the same file, there is a race where
even though the asynchronous qemu process has responded to "quit", it
has not yet had time to unlock the file and exit, resulting in:

-[{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false},
-{ "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": true},
-{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]
+qemu-nbd: Failed to blk_new_open 'tests/qemu-iotests/scratch/t.qcow2': Failed to get shared "write" lock
+Is another process using the image [tests/qemu-iotests/scratch/t.qcow2]?
+qemu-img: Could not open 'driver=nbd,server.type=unix,server.path=tests/qemu-iotests/scratch/qemu-nbd.sock,x-dirty-bitmap=qemu:dirty-bitmap:b': Failed to connect socket tests/qemu-iotests/scratch/qemu-nbd.sock: Connection refused
+./common.nbd: line 33: kill: (11122) - No such process

Fixes: ddd09448
Reported-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20190305182908.13557-1-eblake@redhat.com>
Tested-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
parent ab7c5d94

tests/qemu-iotests/223

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove", 
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "error" # Again

_send_qemu_cmd $QEMU_HANDLE '{"execute":"quit"}' "return"

wait=yes _cleanup_qemu



echo

echo "=== Use qemu-nbd as server ==="

tests/qemu-iotests/223.out

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ read 2097152/2097152 bytes at offset 2097152 
{"return": {}}

{"error": {"class": "GenericError", "desc": "NBD server not running"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}



=== Use qemu-nbd as server ===