From nobody Mon May 6 05:07:20 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15034971884731015.6273036165579; Wed, 23 Aug 2017 07:06:28 -0700 (PDT) Received: from localhost ([::1]:43884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkWIc-0006L9-Lt for importer@patchew.org; Wed, 23 Aug 2017 10:06:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkWHi-0005y6-88 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 10:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkWHd-0005ih-SZ for qemu-devel@nongnu.org; Wed, 23 Aug 2017 10:05:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57560) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkWHa-0005ZZ-Mi; Wed, 23 Aug 2017 10:05:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67ED781E01; Wed, 23 Aug 2017 14:05:21 +0000 (UTC) Received: from localhost (ovpn-117-34.ams2.redhat.com [10.36.117.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B7657F462; Wed, 23 Aug 2017 14:05:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 67ED781E01 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=stefanha@redhat.com From: Stefan Hajnoczi To: Date: Wed, 23 Aug 2017 15:05:06 +0100 Message-Id: <20170823140506.28723-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 23 Aug 2017 14:05:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] qemu-iotests: add 194 non-shared storage migration test 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: Stefan Hajnoczi , Fam Zheng , "Dr. David Alan Gilbert" , qemu-block@nongnu.org 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" Non-shared storage migration with NBD and drive-mirror is currently not tested by qemu-iotests. This test case covers the basic migration scenario. Signed-off-by: Stefan Hajnoczi Based-on: <20170823134242.12080-1-famz@redhat.com> Tested-by: Eric Blake --- tests/qemu-iotests/194 | 73 +++++++++++++++++++++++++++++++++++++++= ++++ tests/qemu-iotests/194.out | 13 ++++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 13 ++++++++ 4 files changed, 100 insertions(+) create mode 100755 tests/qemu-iotests/194 create mode 100644 tests/qemu-iotests/194.out diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 new file mode 100755 index 0000000000..8028111e21 --- /dev/null +++ b/tests/qemu-iotests/194 @@ -0,0 +1,73 @@ +#!/usr/bin/env python +# +# Copyright (C) 2017 Red Hat, Inc. +# +# 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 . +# +# Creator/Owner: Stefan Hajnoczi +# +# Non-shared storage migration test using NBD server and drive-mirror + +import os +import atexit +import iotests + +iotests.verify_platform(['linux']) + +img_size =3D '1G' +source_img_path =3D os.path.join(iotests.test_dir, 'source.img') +dest_img_path =3D os.path.join(iotests.test_dir, 'dest.img') +iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, source_img_path, img= _size) +iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, dest_img_path, img_s= ize) + +iotests.log('Launching VMs...') +migration_sock_path =3D os.path.join(iotests.test_dir, 'migration.sock') +nbd_sock_path =3D os.path.join(iotests.test_dir, 'nbd.sock') +source_vm =3D iotests.VM('source').add_drive(source_img_path) +dest_vm =3D (iotests.VM('dest').add_drive(dest_img_path) + .add_incoming('unix:{0}'.format(migration_soc= k_path))) +source_vm.launch() +atexit.register(source_vm.shutdown) +dest_vm.launch() +atexit.register(dest_vm.shutdown) + +iotests.log('Launching NBD server on destination...') +iotests.log(dest_vm.qmp('nbd-server-start', addr=3D{'type': 'unix', 'data'= : {'path': nbd_sock_path}})) +iotests.log(dest_vm.qmp('nbd-server-add', device=3D'drive0', writable=3DTr= ue)) + +iotests.log('Starting drive-mirror on source...') +iotests.log(source_vm.qmp( + 'drive-mirror', + device=3D'drive0', + target=3D'nbd+unix:///drive0?socket=3D{0}'.format(nbd_sock_p= ath), + sync=3D'full', + format=3D'raw', # always raw, the server handles the format + mode=3D'existing')) + +iotests.log('Waiting for drive-mirror to complete...') +iotests.log(source_vm.event_wait('BLOCK_JOB_READY'), + filters=3D[iotests.filter_qmp_event]) + +iotests.log('Starting migration...') +source_vm.qmp('migrate-set-capabilities', + capabilities=3D[{'capability': 'events', 'state': True}]) +dest_vm.qmp('migrate-set-capabilities', + capabilities=3D[{'capability': 'events', 'state': True}]) +iotests.log(source_vm.qmp('migrate', uri=3D'unix:{0}'.format(migration_soc= k_path))) + +while True: + event =3D source_vm.event_wait('MIGRATION') + iotests.log(event, filters=3D[iotests.filter_qmp_event]) + if event['data']['status'] in ('completed', 'failed'): + break diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out new file mode 100644 index 0000000000..ae501fecac --- /dev/null +++ b/tests/qemu-iotests/194.out @@ -0,0 +1,13 @@ +Launching VMs... +Launching NBD server on destination... +{u'return': {}} +{u'return': {}} +Starting drive-mirror on source... +{u'return': {}} +Waiting for drive-mirror to complete... +{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u= 'device': u'drive0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u= 'offset': 1073741824}, u'event': u'BLOCK_JOB_READY'} +Starting migration... +{u'return': {}} +{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u= 'status': u'setup'}, u'event': u'MIGRATION'} +{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u= 'status': u'active'}, u'event': u'MIGRATION'} +{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u= 'status': u'completed'}, u'event': u'MIGRATION'} diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index afbdc427ea..4bd5017008 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -187,3 +187,4 @@ 189 rw auto 190 rw auto quick 192 rw auto quick +194 rw auto migration quick diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 22439c43d3..7233983f3c 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -133,6 +133,14 @@ chown_re =3D re.compile(r"chown [0-9]+:[0-9]+") def filter_chown(msg): return chown_re.sub("chown UID:GID", msg) =20 +def filter_qmp_event(event): + '''Filter a QMP event dict''' + event =3D dict(event) + if 'timestamp' in event: + event['timestamp']['seconds'] =3D 'SECS' + event['timestamp']['microseconds'] =3D 'USECS' + return event + def log(msg, filters=3D[]): for flt in filters: msg =3D flt(msg) @@ -200,6 +208,11 @@ class VM(qtest.QEMUQtestMachine): self._args.append(','.join(opts)) return self =20 + def add_incoming(self, addr): + self._args.append('-incoming') + self._args.append(addr) + return self + def pause_drive(self, drive, event=3DNone): '''Pause drive r/w operations''' if not event: --=20 2.13.5