From nobody Mon Feb 9 23:15:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528392166821163.71212675444667; Thu, 7 Jun 2018 10:22:46 -0700 (PDT) Received: from localhost ([::1]:59408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQycY-0005tw-1f for importer@patchew.org; Thu, 07 Jun 2018 13:22:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQyUs-0008Ao-8m for qemu-devel@nongnu.org; Thu, 07 Jun 2018 13:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQyUo-00084l-Q8 for qemu-devel@nongnu.org; Thu, 07 Jun 2018 13:14:50 -0400 Received: from relay.sw.ru ([195.214.232.25]:52012) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQyUo-0007zs-Cz; Thu, 07 Jun 2018 13:14:46 -0400 Received: from msk-vpn.virtuozzo.com ([195.214.232.6] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fQyUl-0007DI-Eh; Thu, 07 Jun 2018 20:14:43 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 7 Jun 2018 20:14:41 +0300 Message-Id: <20180607171441.64079-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180607171441.64079-1-vsementsov@virtuozzo.com> References: <20180607171441.64079-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v2 11/11] iotests: test nbd reconnect X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add test, which starts backup to nbd target and restarts nbd server during backup. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/220 | 68 +++++++++++++++++++++++++++++++++++++++= ++++ tests/qemu-iotests/220.out | 7 +++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 4 +++ 4 files changed, 80 insertions(+) create mode 100755 tests/qemu-iotests/220 create mode 100644 tests/qemu-iotests/220.out diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220 new file mode 100755 index 0000000000..f1c26a2796 --- /dev/null +++ b/tests/qemu-iotests/220 @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# +# Test nbd reconnect +# +# Copyright (c) 2018 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 . +# + +import time + +import iotests +from iotests import qemu_img_create, file_path, qemu_nbd_popen + +disk_a, disk_b, nbd_sock =3D file_path('disk_a', 'disk_b', 'nbd-sock') +nbd_uri =3D 'nbd+unix:///exp?socket=3D' + nbd_sock + +qemu_img_create('-f', iotests.imgfmt, disk_a, '5M') +qemu_img_create('-f', iotests.imgfmt, disk_b, '5M') +srv =3D qemu_nbd_popen('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, = disk_b) +time.sleep(1) + +vm =3D iotests.VM().add_drive(disk_a) +vm.launch() +vm.hmp_qemu_io('drive0', 'write 0 5M') + +print 'blockdev-add:', vm.qmp('blockdev-add', node_name=3D'backup0', drive= r=3D'raw', + file=3D{'driver':'nbd', + 'reconnect-attempts':10, + 'export': 'exp', + 'server': {'type': 'unix', + 'path': nbd_sock}}) +print 'blockdev-backup:', vm.qmp('blockdev-backup', device=3D'drive0', + sync=3D'full', target=3D'backup0') + +time.sleep(1) +print 'Kill NBD server' +srv.kill() + +jobs =3D vm.qmp('query-block-jobs')['return'] +if jobs and jobs[0]['offset'] < jobs[0]['len']: + print 'Backup job is still in progress' + +time.sleep(1) + +print 'Start NBD server' +srv =3D qemu_nbd_popen('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, = disk_b) + +try: + e =3D vm.event_wait('BLOCK_JOB_COMPLETED') + print e['event'], ':', e['data'] +except: + pass + +print 'blockdev-del:', vm.qmp('blockdev-del', node_name=3D'backup0') +srv.kill() +vm.shutdown() diff --git a/tests/qemu-iotests/220.out b/tests/qemu-iotests/220.out new file mode 100644 index 0000000000..dae1a49d9f --- /dev/null +++ b/tests/qemu-iotests/220.out @@ -0,0 +1,7 @@ +blockdev-add: {u'return': {}} +blockdev-backup: {u'return': {}} +Kill NBD server +Backup job is still in progress +Start NBD server +BLOCK_JOB_COMPLETED : {u'device': u'drive0', u'type': u'backup', u'speed':= 0, u'len': 5242880, u'offset': 5242880} +blockdev-del: {u'return': {}} diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 93f93d71ba..cc5a1cf2a4 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -217,3 +217,4 @@ 216 rw auto quick 218 rw auto quick 219 rw auto +220 rw auto quick diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index fdbdd8b300..7071318c9e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -175,6 +175,10 @@ def qemu_nbd(*args): '''Run qemu-nbd in daemon mode and return the parent's exit code''' return subprocess.call(qemu_nbd_args + ['--fork'] + list(args)) =20 +def qemu_nbd_popen(*args): + '''Run qemu-nbd in daemon mode and return the parent's exit code''' + return subprocess.Popen(qemu_nbd_args + ['--persistent'] + list(args)) + def compare_images(img1, img2, fmt1=3Dimgfmt, fmt2=3Dimgfmt): '''Return True if two image files are identical''' return qemu_img('compare', '-f', fmt1, --=20 2.11.1