{"id":807838,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807838/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830180711.7974-2-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830180711.7974-2-eblake@redhat.com>","list_archive_url":null,"date":"2017-08-30T18:07:01","name":"[PULL,01/11] qemu-iotests: Extend non-shared storage migration test (194)","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4908c6327b1dceebf99e83902d237981c78bde56","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.2/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830180711.7974-2-eblake@redhat.com/mbox/","series":[{"id":679,"url":"http://patchwork.ozlabs.org/api/1.2/series/679/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=679","date":"2017-08-30T18:07:00","name":"[PULL,01/11] qemu-iotests: Extend non-shared storage migration test (194)","version":1,"mbox":"http://patchwork.ozlabs.org/series/679/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807838/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807838/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjD5Z1x6cz9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 04:08:34 +1000 (AEST)","from localhost ([::1]:52041 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dn7Pk-0002Bk-0W\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 14:08:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52995)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dn7Od-0001ny-2O\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:24 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dn7Ob-0001Yv-LL\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:23 -0400","from mx1.redhat.com ([209.132.183.28]:60492)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>)\n\tid 1dn7OY-0001YN-IT; Wed, 30 Aug 2017 14:07:18 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 851FD285A0;\n\tWed, 30 Aug 2017 18:07:17 +0000 (UTC)","from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 3C451173A6;\n\tWed, 30 Aug 2017 18:07:16 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 851FD285A0","From":"Eric Blake <eblake@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 13:07:01 -0500","Message-Id":"<20170830180711.7974-2-eblake@redhat.com>","In-Reply-To":"<20170830180711.7974-1-eblake@redhat.com>","References":"<20170830180711.7974-1-eblake@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\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 30 Aug 2017 18:07:17 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 01/11] qemu-iotests: Extend non-shared storage\n\tmigration test (194)","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>,\n\t\"open list:Block layer core\" <qemu-block@nongnu.org>,\n\tKashyap Chamarthy <kchamart@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Kashyap Chamarthy <kchamart@redhat.com>\n\nThis is the follow-up patch that was discussed[*] as part of feedback to\nqemu-iotest 194.\n\nChanges in this patch:\n\n  - Supply 'job-id' parameter to `drive-mirror` invocation.\n\n  - Once migration completes, issue QMP `block-job-cancel` command on\n    the source QEMU to gracefully complete `drive-mirror` operation.\n\n  - Once the BLOCK_JOB_COMPLETED event is emitted, stop the NBD server\n    on the destination QEMU.\n\n  - Check for both the events: MIGRATION and BLOCK_JOB_COMPLETED.\n\nWith the above, the test will also be (almost) in sync with the\nprocedure outlined in the document 'live-block-operations.rst'[+]\n(section: \"QMP invocation for live storage migration with\n``drive-mirror`` + NBD\").\n\n[*] https://lists.nongnu.org/archive/html/qemu-devel/2017-08/msg04820.html\n    -- qemu-iotests: add 194 non-shared storage migration test\n[+] https://git.qemu.org/gitweb.cgi?p=qemu.git;a=blob;f=docs/interop/live-block-operations.rst\n\nSigned-off-by: Kashyap Chamarthy <kchamart@redhat.com>\nMessage-Id: <20170829165058.8229-1-kchamart@redhat.com>\nReviewed-by: Stefan Hajnoczi <stefanha@redhat.com>\nSigned-off-by: Eric Blake <eblake@redhat.com>\n---\n tests/qemu-iotests/194     | 23 +++++++++++++++++------\n tests/qemu-iotests/194.out | 11 ++++++++---\n 2 files changed, 25 insertions(+), 9 deletions(-)","diff":"diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194\nindex 8028111e21..a3e3bad664 100755\n--- a/tests/qemu-iotests/194\n+++ b/tests/qemu-iotests/194\n@@ -46,16 +46,17 @@ iotests.log('Launching NBD server on destination...')\n iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data': {'path': nbd_sock_path}}))\n iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True))\n\n-iotests.log('Starting drive-mirror on source...')\n+iotests.log('Starting `drive-mirror` on source...')\n iotests.log(source_vm.qmp(\n               'drive-mirror',\n               device='drive0',\n               target='nbd+unix:///drive0?socket={0}'.format(nbd_sock_path),\n               sync='full',\n               format='raw', # always raw, the server handles the format\n-              mode='existing'))\n+              mode='existing',\n+              job_id='mirror-job0'))\n\n-iotests.log('Waiting for drive-mirror to complete...')\n+iotests.log('Waiting for `drive-mirror` to complete...')\n iotests.log(source_vm.event_wait('BLOCK_JOB_READY'),\n             filters=[iotests.filter_qmp_event])\n\n@@ -67,7 +68,17 @@ dest_vm.qmp('migrate-set-capabilities',\n iotests.log(source_vm.qmp('migrate', uri='unix:{0}'.format(migration_sock_path)))\n\n while True:\n-    event = source_vm.event_wait('MIGRATION')\n-    iotests.log(event, filters=[iotests.filter_qmp_event])\n-    if event['data']['status'] in ('completed', 'failed'):\n+    event1 = source_vm.event_wait('MIGRATION')\n+    iotests.log(event1, filters=[iotests.filter_qmp_event])\n+    if event1['data']['status'] in ('completed', 'failed'):\n+        iotests.log('Gracefully ending the `drive-mirror` job on source...')\n+        iotests.log(source_vm.qmp('block-job-cancel', device='mirror-job0'))\n+        break\n+\n+while True:\n+    event2 = source_vm.event_wait('BLOCK_JOB_COMPLETED')\n+    iotests.log(event2, filters=[iotests.filter_qmp_event])\n+    if event2['event'] == 'BLOCK_JOB_COMPLETED':\n+        iotests.log('Stopping the NBD server on destination...')\n+        iotests.log(dest_vm.qmp('nbd-server-stop'))\n         break\ndiff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out\nindex ae501fecac..50ac50da5e 100644\n--- a/tests/qemu-iotests/194.out\n+++ b/tests/qemu-iotests/194.out\n@@ -2,12 +2,17 @@ Launching VMs...\n Launching NBD server on destination...\n {u'return': {}}\n {u'return': {}}\n-Starting drive-mirror on source...\n+Starting `drive-mirror` on source...\n {u'return': {}}\n-Waiting for drive-mirror to complete...\n-{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'}\n+Waiting for `drive-mirror` to complete...\n+{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'mirror-job0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_READY'}\n Starting migration...\n {u'return': {}}\n {u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'setup'}, u'event': u'MIGRATION'}\n {u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'active'}, u'event': u'MIGRATION'}\n {u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'completed'}, u'event': u'MIGRATION'}\n+Gracefully ending the `drive-mirror` job on source...\n+{u'return': {}}\n+{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'mirror-job0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_COMPLETED'}\n+Stopping the NBD server on destination...\n+{u'return': {}}\n","prefixes":["PULL","01/11"]}