diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2018-11-16 15:53:23 +0000 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2018-11-19 11:16:46 -0600 |
| commit | b39b58d5d0da3e7057d7d636641018b0fc25139b (patch) | |
| tree | bfaa775e95e06fc6f09f51b5fce6b06b267fe8a1 /tests/qemu-iotests | |
| parent | e6d5d6fdd43484f60f678e66c21f0d1286749977 (diff) | |
| download | qemu-b39b58d5d0da3e7057d7d636641018b0fc25139b.zip qemu-b39b58d5d0da3e7057d7d636641018b0fc25139b.tar.gz qemu-b39b58d5d0da3e7057d7d636641018b0fc25139b.tar.bz2 | |
tests: check if qemu-nbd is still alive before waiting
If the qemu-nbd UNIX socket has not shown up, the tests will sleep a bit
and then check again repeatedly for up to 30 seconds. This is pointless
if the qemu-nbd process has quit due to an error, so check whether the
pid is still alive before waiting and retrying.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20181116155325.22428-5-berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rw-r--r-- | tests/qemu-iotests/common.nbd | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd index 27357f3..9f841ab 100644 --- a/tests/qemu-iotests/common.nbd +++ b/tests/qemu-iotests/common.nbd @@ -37,11 +37,19 @@ function nbd_server_stop() function nbd_server_wait_for_unix_socket() { + pid=$1 + for ((i = 0; i < 300; i++)) do if [ -r "$nbd_unix_socket" ]; then return fi + kill -s 0 $pid 2>/dev/null + if test $? != 0 + then + echo "qemu-nbd unexpectedly quit" + exit 1 + fi sleep 0.1 done echo "Failed in check of unix socket created by qemu-nbd" @@ -52,5 +60,5 @@ function nbd_server_start_unix_socket() { nbd_server_stop $QEMU_NBD -v -t -k "$nbd_unix_socket" "$@" & - nbd_server_wait_for_unix_socket + nbd_server_wait_for_unix_socket $! } |