From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, hreitz@redhat.com,
kwolf@redhat.com, vsementsov@virtuozzo.com, eblake@redhat.com,
den@openvz.org
Subject: [PATCH v3 9/9] iotests: add nbd-reconnect-on-open test
Date: Mon, 6 Sep 2021 22:06:54 +0300 [thread overview]
Message-ID: <20210906190654.183421-10-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210906190654.183421-1-vsementsov@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
.../qemu-iotests/tests/nbd-reconnect-on-open | 71 +++++++++++++++++++
.../tests/nbd-reconnect-on-open.out | 11 +++
2 files changed, 82 insertions(+)
create mode 100755 tests/qemu-iotests/tests/nbd-reconnect-on-open
create mode 100644 tests/qemu-iotests/tests/nbd-reconnect-on-open.out
diff --git a/tests/qemu-iotests/tests/nbd-reconnect-on-open b/tests/qemu-iotests/tests/nbd-reconnect-on-open
new file mode 100755
index 0000000000..7ee9bce947
--- /dev/null
+++ b/tests/qemu-iotests/tests/nbd-reconnect-on-open
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+#
+# Test nbd reconnect on open
+#
+# Copyright (c) 2020 Virtuozzo International GmbH
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import time
+
+import iotests
+from iotests import qemu_img_create, file_path, qemu_io_popen, qemu_nbd, \
+ qemu_io_log, log
+
+iotests.script_initialize(supported_fmts=['qcow2'])
+
+disk, nbd_sock = file_path('disk', 'nbd-sock')
+
+
+def create_args(open_timeout):
+ return ['--image-opts', '-c', 'read 0 1M',
+ f'driver=nbd,open-timeout={open_timeout},'
+ f'server.type=unix,server.path={nbd_sock}']
+
+
+def check_fail_to_connect(open_timeout):
+ log(f'Check fail to connect with {open_timeout} seconds of timeout')
+
+ start_t = time.time()
+ qemu_io_log(*create_args(open_timeout))
+ delta_t = time.time() - start_t
+
+ max_delta = open_timeout + 0.2
+ if open_timeout <= delta_t <= max_delta:
+ log(f'qemu_io finished in {open_timeout}..{max_delta} seconds, OK')
+ else:
+ note = 'too early' if delta_t < open_timeout else 'too long'
+ log(f'qemu_io finished in {delta_t:.1f} seconds, {note}')
+
+
+qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+
+# Start NBD client when NBD server is not yet running. It should not fail, but
+# wait for 5 seconds for the server to be available.
+client = qemu_io_popen(*create_args(5))
+
+time.sleep(1)
+qemu_nbd('-k', nbd_sock, '-f', iotests.imgfmt, disk)
+
+# client should succeed
+log(client.communicate()[0], filters=[iotests.filter_qemu_io])
+
+# Server was started without --persistent flag, so it should be off now. Let's
+# check it and it the same time check that with open-timeout=0 client fails
+# immediately.
+check_fail_to_connect(0)
+
+# Check that we will fail after non-zero timeout if server is still unavailable
+check_fail_to_connect(1)
diff --git a/tests/qemu-iotests/tests/nbd-reconnect-on-open.out b/tests/qemu-iotests/tests/nbd-reconnect-on-open.out
new file mode 100644
index 0000000000..a35ae30ea4
--- /dev/null
+++ b/tests/qemu-iotests/tests/nbd-reconnect-on-open.out
@@ -0,0 +1,11 @@
+read 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+Check fail to connect with 0 seconds of timeout
+qemu-io: can't open: Failed to connect to 'TEST_DIR/PID-nbd-sock': No such file or directory
+
+qemu_io finished in 0..0.2 seconds, OK
+Check fail to connect with 1 seconds of timeout
+qemu-io: can't open: Failed to connect to 'TEST_DIR/PID-nbd-sock': No such file or directory
+
+qemu_io finished in 1..1.2 seconds, OK
--
2.29.2
next prev parent reply other threads:[~2021-09-06 19:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 19:06 [PATCH v3 0/9] nbd reconnect on open Vladimir Sementsov-Ogievskiy
2021-09-06 19:06 ` [PATCH v3 1/9] nbd/client-connection: nbd_co_establish_connection(): fix non set errp Vladimir Sementsov-Ogievskiy
2021-09-07 17:44 ` Eric Blake
2021-09-24 19:19 ` Eric Blake
2021-09-06 19:06 ` [PATCH v3 2/9] qapi: make blockdev-add a coroutine command Vladimir Sementsov-Ogievskiy
2021-09-06 19:28 ` Markus Armbruster
2021-09-06 21:40 ` Vladimir Sementsov-Ogievskiy
2021-09-07 6:14 ` Markus Armbruster
2021-09-27 11:25 ` Vladimir Sementsov-Ogievskiy
2021-09-06 19:06 ` [PATCH v3 3/9] nbd: allow reconnect on open, with corresponding new options Vladimir Sementsov-Ogievskiy
2021-09-07 20:36 ` Eric Blake
2021-09-06 19:06 ` [PATCH v3 4/9] nbd/client-connection: nbd_co_establish_connection(): return real error Vladimir Sementsov-Ogievskiy
2021-09-07 20:42 ` Eric Blake
2021-09-06 19:06 ` [PATCH v3 5/9] nbd/client-connection: improve error message of cancelled attempt Vladimir Sementsov-Ogievskiy
2021-09-07 20:45 ` Eric Blake
2021-09-06 19:06 ` [PATCH v3 6/9] iotests.py: add qemu_tool_popen() Vladimir Sementsov-Ogievskiy
2021-09-06 19:06 ` [PATCH v3 7/9] iotests.py: add and use qemu_io_wrap_args() Vladimir Sementsov-Ogievskiy
2021-09-06 19:06 ` [PATCH v3 8/9] iotests.py: add qemu_io_popen() Vladimir Sementsov-Ogievskiy
2021-09-06 19:06 ` Vladimir Sementsov-Ogievskiy [this message]
2021-09-07 20:51 ` [PATCH v3 9/9] iotests: add nbd-reconnect-on-open test Eric Blake
2021-09-08 7:55 ` Vladimir Sementsov-Ogievskiy
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=20210906190654.183421-10-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).