From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com,
eblake@redhat.com, vsementsov@virtuozzo.com, den@openvz.org
Subject: [PATCH 3/3] iotests: add 306 to test reconnect on nbd open
Date: Mon, 7 Sep 2020 13:24:26 +0300 [thread overview]
Message-ID: <20200907102426.24766-4-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20200907102426.24766-1-vsementsov@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
tests/qemu-iotests/306 | 46 +++++++++++++++++++++++++++++++++++
tests/qemu-iotests/306.out | 5 ++++
tests/qemu-iotests/group | 1 +
tests/qemu-iotests/iotests.py | 11 +++++++++
4 files changed, 63 insertions(+)
create mode 100755 tests/qemu-iotests/306
create mode 100644 tests/qemu-iotests/306.out
diff --git a/tests/qemu-iotests/306 b/tests/qemu-iotests/306
new file mode 100755
index 0000000000..4b8b4090be
--- /dev/null
+++ b/tests/qemu-iotests/306
@@ -0,0 +1,46 @@
+#!/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
+
+disk, nbd_sock = file_path('disk', 'nbd-sock')
+qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+
+client = qemu_io_popen('--image-opts', '-c', 'read 0 1M',
+ 'driver=nbd,__virtuozzo_open-reconnect-attempts=4,'
+ 'server.type=unix,server.path=' + nbd_sock)
+
+time.sleep(2)
+
+qemu_nbd('-k', nbd_sock, '-f', iotests.imgfmt, disk)
+
+iotests.log(client.communicate()[0], filters=[iotests.filter_qemu_io])
+
+client = qemu_io_popen('--image-opts', '-c', 'read 0 1M',
+ 'driver=nbd,__virtuozzo_open-reconnect-attempts=1,'
+ 'server.type=unix,server.path=' + nbd_sock)
+
+time.sleep(1.5)
+
+iotests.log(client.communicate()[0], filters=[iotests.filter_qemu_io,
+ iotests.filter_testfiles])
diff --git a/tests/qemu-iotests/306.out b/tests/qemu-iotests/306.out
new file mode 100644
index 0000000000..82c74b4a2d
--- /dev/null
+++ b/tests/qemu-iotests/306.out
@@ -0,0 +1,5 @@
+read 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+can't open: Failed to connect socket TEST_DIR/PID-nbd-sock: No such file or directory
+
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 5cad015231..e2b479ffb1 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -313,3 +313,4 @@
302 quick
303 rw quick
304 rw quick
+306 rw auto quick
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e197c73ca5..7d8f53fe19 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -195,6 +195,17 @@ def qemu_io_log(*args):
log(result, filters=[filter_testfiles, filter_qemu_io])
return result
+def qemu_io_popen(*args):
+ '''Run qemu-nbd in daemon mode and return the parent's exit code'''
+ default_args = qemu_io_args[:]
+
+ if ('-f' in args or '--image-opts' in args) and '-f' in default_args:
+ ind = default_args.index('-f')
+ del default_args[ind:ind+2]
+
+ return subprocess.Popen(default_args + list(args), stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT)
+
def qemu_io_silent(*args):
'''Run qemu-io and return the exit code, suppressing stdout'''
args = qemu_io_args + list(args)
--
2.21.3
prev parent reply other threads:[~2020-09-07 10:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 10:24 [PATCH 0/3] nbd reconnect on open Vladimir Sementsov-Ogievskiy
2020-09-07 10:24 ` [PATCH 1/3] block/nbd: move initial connect to coroutine Vladimir Sementsov-Ogievskiy
2020-09-07 10:24 ` [PATCH 2/3] nbd: allow reconnect on open, with corresponding new options Vladimir Sementsov-Ogievskiy
2020-09-07 10:24 ` Vladimir Sementsov-Ogievskiy [this message]
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=20200907102426.24766-4-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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).