[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/12] tests: check if qemu-nbd is still alive before
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 08/12] tests: check if qemu-nbd is still alive before waiting |
Date: |
Mon, 19 Nov 2018 11:54:23 -0600 |
From: Daniel P. Berrangé <address@hidden>
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é <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/common.nbd | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd
index 27357f3151d..9f841ab4029 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 $!
}
--
2.17.2
- [Qemu-devel] [PULL 00/12] NBD patches for 3.1-rc2, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 02/12] qemu-iotests: convert `pwd` and $(pwd) to $PWD, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 06/12] io: return 0 for EOF in TLS session read after shutdown, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 03/12] qemu-iotests: Modern shell scripting (use $() instead of ``), Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 05/12] nbd/server: Ignore write errors when replying to NBD_OPT_ABORT, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 09/12] tests: add iotests helpers for dealing with TLS certificates, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 08/12] tests: check if qemu-nbd is still alive before waiting,
Eric Blake <=
- [Qemu-devel] [PULL 07/12] tests: pull qemu-nbd iotest helpers into common.nbd file, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 11/12] iotests: Also test I/O over NBD TLS, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 10/12] tests: exercise NBD server in TLS mode, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 12/12] iotests: Drop use of bash keyword 'function', Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 01/12] qemu-iotests: remove unused variable 'here', Eric Blake, 2018/11/19
- Re: [Qemu-devel] [PULL 00/12] NBD patches for 3.1-rc2, Peter Maydell, 2018/11/20