qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 3/3] iotests: add 306 to test reconnect on nbd open


From: Vladimir Sementsov-Ogievskiy
Subject: [PATCH 3/3] iotests: add 306 to test reconnect on nbd open
Date: Mon, 7 Sep 2020 13:24:26 +0300

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]