qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net,
	stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com,
	jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org
Subject: [PATCH 11/11] iotests/264: add backup-cancel test-case
Date: Wed, 18 Nov 2020 21:04:33 +0300	[thread overview]
Message-ID: <20201118180433.11931-12-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com>

Check that cancel doesn't wait for 10s of nbd reconnect timeout.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/264 | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264
index 3c6f29317f..b830078834 100755
--- a/tests/qemu-iotests/264
+++ b/tests/qemu-iotests/264
@@ -93,13 +93,7 @@ class TestNbdReconnect(iotests.QMPTestCase):
             result = self.vm.qmp('blockdev-del', node_name='backup0')
             self.assert_qmp(result, 'return', {})
 
-    def test_mirror_cancel(self):
-        # Mirror speed limit doesn't work well enough, it seems that mirror
-        # will run many parallel requests anyway. MAX_IN_FLIGHT is 16 and
-        # MAX_IO_BYTES is 1M in mirror.c, so let's use 20M disk.
-        self.init_vm(20 * 1024 * 1024)
-        self.start_job('blockdev-mirror')
-
+    def cancel_job(self):
         result = self.vm.qmp('block-job-cancel', device='drive0')
         self.assert_qmp(result, 'return', {})
 
@@ -108,6 +102,19 @@ class TestNbdReconnect(iotests.QMPTestCase):
         delta_t = time.time() - start_t
         self.assertTrue(delta_t < 2.0)
 
+    def test_mirror_cancel(self):
+        # Mirror speed limit doesn't work well enough, it seems that mirror
+        # will run many parallel requests anyway. MAX_IN_FLIGHT is 16 and
+        # MAX_IO_BYTES is 1M in mirror.c, so let's use 20M disk.
+        self.init_vm(20 * 1024 * 1024)
+        self.start_job('blockdev-mirror')
+        self.cancel_job()
+
+    def test_backup_cancel(self):
+        self.init_vm(5 * 1024 * 1024)
+        self.start_job('blockdev-backup')
+        self.cancel_job()
+
 
 if __name__ == '__main__':
     iotests.main(supported_fmts=['qcow2'])
-- 
2.21.3



  parent reply	other threads:[~2020-11-18 18:29 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 18:04 [PATCH 00/11] mirror: cancel nbd reconnect Vladimir Sementsov-Ogievskiy
2020-11-18 18:04 ` [PATCH 01/11] block: add new BlockDriver handler: bdrv_cancel_in_flight Vladimir Sementsov-Ogievskiy
2021-01-20 22:27   ` Eric Blake
2021-01-21 18:50     ` Vladimir Sementsov-Ogievskiy
2020-11-18 18:04 ` [PATCH 02/11] block/nbd: implement .bdrv_cancel_in_flight Vladimir Sementsov-Ogievskiy
2021-01-20 23:13   ` Eric Blake
2020-11-18 18:04 ` [PATCH 03/11] block/raw-format: implement .bdrv_cancel_in_flight handler Vladimir Sementsov-Ogievskiy
2021-01-20 23:15   ` Eric Blake
2021-01-21 19:08     ` Vladimir Sementsov-Ogievskiy
2020-11-18 18:04 ` [PATCH 04/11] job: add .cancel handler for the driver Vladimir Sementsov-Ogievskiy
2021-01-20 23:17   ` Eric Blake
2021-01-21  9:32     ` Vladimir Sementsov-Ogievskiy
2020-11-18 18:04 ` [PATCH 05/11] block/mirror: implement .cancel job handler Vladimir Sementsov-Ogievskiy
2021-01-21  1:05   ` Eric Blake
2020-11-18 18:04 ` [PATCH 06/11] iotests/264: fix style Vladimir Sementsov-Ogievskiy
2021-01-21  1:13   ` Eric Blake
2020-11-18 18:04 ` [PATCH 07/11] iotests/264: move to python unittest Vladimir Sementsov-Ogievskiy
2021-01-21  1:17   ` Eric Blake
2021-01-21 19:29     ` Vladimir Sementsov-Ogievskiy
2020-11-18 18:04 ` [PATCH 08/11] iotests.py: qemu_nbd_popen: remove pid file after use Vladimir Sementsov-Ogievskiy
2021-01-21  1:19   ` Eric Blake
2020-11-18 18:04 ` [PATCH 09/11] iotests/264: add mirror-cancel test-case Vladimir Sementsov-Ogievskiy
2021-01-21  1:26   ` Eric Blake
2021-01-21 19:42     ` Vladimir Sementsov-Ogievskiy
2020-11-18 18:04 ` [PATCH 10/11] block/backup: implement .cancel job handler Vladimir Sementsov-Ogievskiy
2021-01-21  1:27   ` Eric Blake
2020-11-18 18:04 ` Vladimir Sementsov-Ogievskiy [this message]
2021-01-21  1:28   ` [PATCH 11/11] iotests/264: add backup-cancel test-case Eric Blake
2021-01-21  2:21     ` Eric Blake
2021-01-21 19:43       ` Vladimir Sementsov-Ogievskiy
2020-11-18 18:19 ` [PATCH 00/11] mirror: cancel nbd reconnect Eric Blake
2020-11-18 18:36   ` Vladimir Sementsov-Ogievskiy
2020-12-18 11:05 ` Vladimir Sementsov-Ogievskiy
2021-01-09 10:11   ` Vladimir Sementsov-Ogievskiy
2021-01-21  2:14 ` Eric Blake
2021-01-21 19:44   ` Vladimir Sementsov-Ogievskiy

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=20201118180433.11931-12-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).