From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, berrange@redhat.com,
mreitz@redhat.com, rkagan@virtuozzo.com,
andrey.shinkevich@virtuozzo.com, den@openvz.org
Subject: [Qemu-devel] [PATCH v2 6/7] iotests: amend QEMU NBD process synchronization
Date: Tue, 11 Jun 2019 21:02:10 +0300 [thread overview]
Message-ID: <1560276131-683243-7-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1560276131-683243-1-git-send-email-andrey.shinkevich@virtuozzo.com>
Processes are dying harder under the Valgring. It results in counting
the dying process as a newborn one. Make it sure that old NBD job get
finished before starting a new one.
Suggested-by: Roman Kagan <rkagan@virtuozzo.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
---
tests/qemu-iotests/common.nbd | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd
index 25fc9ff..e3dcc60 100644
--- a/tests/qemu-iotests/common.nbd
+++ b/tests/qemu-iotests/common.nbd
@@ -22,6 +22,7 @@
nbd_unix_socket="${TEST_DIR}/qemu-nbd.sock"
nbd_tcp_addr="127.0.0.1"
nbd_pid_file="${TEST_DIR}/qemu-nbd.pid"
+nbd_job_pid=""
nbd_server_stop()
{
@@ -33,6 +34,9 @@ nbd_server_stop()
kill "$NBD_PID"
fi
fi
+ if [ -n "$nbd_job_pid" ] && kill -s 0 "$nbd_job_pid" 2>/dev/null; then
+ wait "$nbd_job_pid"
+ fi
rm -f "$nbd_unix_socket"
}
@@ -61,6 +65,7 @@ nbd_server_start_unix_socket()
{
nbd_server_stop
$QEMU_NBD -v -t -k "$nbd_unix_socket" "$@" &
+ nbd_job_pid=$!
nbd_server_wait_for_unix_socket $!
}
@@ -105,5 +110,6 @@ nbd_server_start_tcp_socket()
{
nbd_server_stop
$QEMU_NBD -v -t -b $nbd_tcp_addr -p $nbd_tcp_port "$@" &
+ nbd_job_pid=$!
nbd_server_wait_for_tcp_socket $!
}
--
1.8.3.1
next prev parent reply other threads:[~2019-06-11 18:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 18:02 [Qemu-devel] [PATCH v2 0/7] Allow Valgrind checking all QEMU processes Andrey Shinkevich
2019-06-11 18:02 ` [Qemu-devel] [PATCH v2 1/7] iotests: allow " Andrey Shinkevich
2019-06-13 9:44 ` Vladimir Sementsov-Ogievskiy
2019-06-27 15:08 ` Andrey Shinkevich
2019-06-13 9:45 ` Vladimir Sementsov-Ogievskiy
2019-06-11 18:02 ` [Qemu-devel] [PATCH v2 2/7] iotests: exclude killed processes from running under Valgrind Andrey Shinkevich
2019-06-13 9:47 ` Vladimir Sementsov-Ogievskiy
2019-06-17 11:57 ` Roman Kagan
2019-06-17 11:15 ` Kevin Wolf
2019-06-17 12:18 ` Roman Kagan
2019-06-17 12:53 ` Kevin Wolf
2019-06-17 13:20 ` Roman Kagan
2019-06-17 14:51 ` Kevin Wolf
2019-06-24 16:55 ` Andrey Shinkevich
2019-06-11 18:02 ` [Qemu-devel] [PATCH v2 3/7] iotests: Valgrind fails to work with nonexistent directory Andrey Shinkevich
2019-06-13 9:52 ` Vladimir Sementsov-Ogievskiy
2019-06-17 11:22 ` Kevin Wolf
2019-06-11 18:02 ` [Qemu-devel] [PATCH v2 4/7] iotests: extended timeout under Valgrind Andrey Shinkevich
2019-06-13 9:54 ` Vladimir Sementsov-Ogievskiy
2019-06-11 18:02 ` [Qemu-devel] [PATCH v2 5/7] iotests: extend sleeping time " Andrey Shinkevich
2019-06-13 9:55 ` Vladimir Sementsov-Ogievskiy
2019-06-11 18:02 ` Andrey Shinkevich [this message]
2019-06-13 9:59 ` [Qemu-devel] [PATCH v2 6/7] iotests: amend QEMU NBD process synchronization Vladimir Sementsov-Ogievskiy
2019-06-17 12:45 ` Roman Kagan
2019-06-17 12:38 ` Roman Kagan
2019-06-11 18:02 ` [Qemu-devel] [PATCH v2 7/7] iotests: new file to suppress Valgrind errors Andrey Shinkevich
2019-06-13 10:06 ` Vladimir Sementsov-Ogievskiy
2019-06-24 16:55 ` Andrey Shinkevich
2019-06-24 17:09 ` Eric Blake
2019-06-24 17:23 ` Andrey Shinkevich
2019-06-17 11:45 ` Kevin Wolf
2019-06-24 16:55 ` Andrey Shinkevich
2019-06-25 8:13 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560276131-683243-7-git-send-email-andrey.shinkevich@virtuozzo.com \
--to=andrey.shinkevich@virtuozzo.com \
--cc=berrange@redhat.com \
--cc=den@openvz.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rkagan@virtuozzo.com \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).