|
 |
7711c0 |
From 44ff04f6ce608282484fa9894d7fc91e8722015d Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Fri, 22 Mar 2019 03:22:33 +0100
|
|
|
7711c0 |
Subject: [PATCH 066/163] tests: check if qemu-nbd is still alive before
|
|
|
7711c0 |
waiting
|
|
|
7711c0 |
MIME-Version: 1.0
|
|
|
7711c0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7711c0 |
Content-Transfer-Encoding: 8bit
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190322032241.8111-21-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 85102
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 20/28] tests: check if qemu-nbd is still alive before waiting
|
|
|
7711c0 |
Bugzilla: 1691563
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
If the qemu-nbd UNIX socket has not shown up, the tests will sleep a bit
|
|
|
7711c0 |
and then check again repeatedly for up to 30 seconds. This is pointless
|
|
|
7711c0 |
if the qemu-nbd process has quit due to an error, so check whether the
|
|
|
7711c0 |
pid is still alive before waiting and retrying.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
7711c0 |
Message-Id: <20181116155325.22428-5-berrange@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit b39b58d5d0da3e7057d7d636641018b0fc25139b)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
tests/qemu-iotests/common.nbd | 10 +++++++++-
|
|
|
7711c0 |
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd
|
|
|
7711c0 |
index 27357f3..9f841ab 100644
|
|
|
7711c0 |
--- a/tests/qemu-iotests/common.nbd
|
|
|
7711c0 |
+++ b/tests/qemu-iotests/common.nbd
|
|
|
7711c0 |
@@ -37,11 +37,19 @@ function nbd_server_stop()
|
|
|
7711c0 |
|
|
|
7711c0 |
function nbd_server_wait_for_unix_socket()
|
|
|
7711c0 |
{
|
|
|
7711c0 |
+ pid=$1
|
|
|
7711c0 |
+
|
|
|
7711c0 |
for ((i = 0; i < 300; i++))
|
|
|
7711c0 |
do
|
|
|
7711c0 |
if [ -r "$nbd_unix_socket" ]; then
|
|
|
7711c0 |
return
|
|
|
7711c0 |
fi
|
|
|
7711c0 |
+ kill -s 0 $pid 2>/dev/null
|
|
|
7711c0 |
+ if test $? != 0
|
|
|
7711c0 |
+ then
|
|
|
7711c0 |
+ echo "qemu-nbd unexpectedly quit"
|
|
|
7711c0 |
+ exit 1
|
|
|
7711c0 |
+ fi
|
|
|
7711c0 |
sleep 0.1
|
|
|
7711c0 |
done
|
|
|
7711c0 |
echo "Failed in check of unix socket created by qemu-nbd"
|
|
|
7711c0 |
@@ -52,5 +60,5 @@ function nbd_server_start_unix_socket()
|
|
|
7711c0 |
{
|
|
|
7711c0 |
nbd_server_stop
|
|
|
7711c0 |
$QEMU_NBD -v -t -k "$nbd_unix_socket" "$@" &
|
|
|
7711c0 |
- nbd_server_wait_for_unix_socket
|
|
|
7711c0 |
+ nbd_server_wait_for_unix_socket $!
|
|
|
7711c0 |
}
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|