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, armbru@redhat.com,
	crosa@redhat.com, ehabkost@redhat.com, berrange@redhat.com,
	pbonzini@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
	hreitz@redhat.com, kwolf@redhat.com,
	Max Reitz <mreitz@redhat.com>
Subject: [PATCH v8 33/34] iotests/image-fleecing: add test-case for copy-before-write filter
Date: Tue, 24 Aug 2021 11:38:55 +0300	[thread overview]
Message-ID: <20210824083856.17408-34-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210824083856.17408-1-vsementsov@virtuozzo.com>

New fleecing method becomes available: copy-before-write filter.

Actually we don't need backup job to setup image fleecing. Add test
for new recommended way of image fleecing.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/tests/image-fleecing     | 50 +++++++++-----
 tests/qemu-iotests/tests/image-fleecing.out | 72 +++++++++++++++++++++
 2 files changed, 107 insertions(+), 15 deletions(-)

diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing
index e210c00d28..f6318492c6 100755
--- a/tests/qemu-iotests/tests/image-fleecing
+++ b/tests/qemu-iotests/tests/image-fleecing
@@ -48,7 +48,7 @@ remainder = [('0xd5', '0x108000',  '32k'), # Right-end of partial-left [1]
              ('0xdc', '32M',       '32k'), # Left-end of partial-right [2]
              ('0xcd', '0x3ff0000', '64k')] # patterns[3]
 
-def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm):
+def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm):
     log('--- Setting up images ---')
     log('')
 
@@ -67,6 +67,7 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm):
 
     src_node = 'source'
     tmp_node = 'temp'
+    qom_path = '/machine/peripheral/sda'
     vm.add_blockdev(f'driver={iotests.imgfmt},file.driver=file,'
                     f'file.filename={base_img_path},node-name={src_node}')
     vm.add_device('virtio-scsi')
@@ -90,12 +91,22 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm):
         'backing': src_node,
     }))
 
-    # Establish COW from source to fleecing node
-    log(vm.qmp('blockdev-backup',
-               job_id='fleecing',
-               device=src_node,
-               target=tmp_node,
-               sync='none'))
+    # Establish CBW from source to fleecing node
+    if use_cbw:
+        log(vm.qmp('blockdev-add', {
+            'driver': 'copy-before-write',
+            'node-name': 'fl-cbw',
+            'file': src_node,
+            'target': tmp_node
+        }))
+
+        log(vm.qmp('qom-set', path=qom_path, property='drive', value='fl-cbw'))
+    else:
+        log(vm.qmp('blockdev-backup',
+                   job_id='fleecing',
+                   device=src_node,
+                   target=tmp_node,
+                   sync='none'))
 
     log('')
     log('--- Setting up NBD Export ---')
@@ -124,7 +135,7 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm):
     for p in overwrite:
         cmd = 'write -P%s %s %s' % p
         log(cmd)
-        log(vm.hmp_qemu_io('/machine/peripheral/sda', cmd, qdev=True))
+        log(vm.hmp_qemu_io(qom_path, cmd, qdev=True))
 
     log('')
     log('--- Verifying Data ---')
@@ -139,10 +150,15 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm):
     log('--- Cleanup ---')
     log('')
 
-    log(vm.qmp('block-job-cancel', device='fleecing'))
-    e = vm.event_wait('BLOCK_JOB_CANCELLED')
-    assert e is not None
-    log(e, filters=[iotests.filter_qmp_event])
+    if use_cbw:
+        log(vm.qmp('qom-set', path=qom_path, property='drive', value=src_node))
+        log(vm.qmp('blockdev-del', node_name='fl-cbw'))
+    else:
+        log(vm.qmp('block-job-cancel', device='fleecing'))
+        e = vm.event_wait('BLOCK_JOB_CANCELLED')
+        assert e is not None
+        log(e, filters=[iotests.filter_qmp_event])
+
     log(vm.qmp('nbd-server-stop'))
     log(vm.qmp('blockdev-del', node_name=tmp_node))
     vm.shutdown()
@@ -160,13 +176,17 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm):
     log('Done')
 
 
-def test():
+def test(use_cbw):
     with iotests.FilePath('base.img') as base_img_path, \
          iotests.FilePath('fleece.img') as fleece_img_path, \
          iotests.FilePath('nbd.sock',
                           base_dir=iotests.sock_dir) as nbd_sock_path, \
          iotests.VM() as vm:
-        do_test(base_img_path, fleece_img_path, nbd_sock_path, vm)
+        do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm)
+
 
+log('=== Test backup(sync=none) based fleecing ===\n')
+test(False)
 
-test()
+log('=== Test filter based fleecing ===\n')
+test(True)
diff --git a/tests/qemu-iotests/tests/image-fleecing.out b/tests/qemu-iotests/tests/image-fleecing.out
index 314a1b54e9..e96d122a8b 100644
--- a/tests/qemu-iotests/tests/image-fleecing.out
+++ b/tests/qemu-iotests/tests/image-fleecing.out
@@ -1,3 +1,5 @@
+=== Test backup(sync=none) based fleecing ===
+
 --- Setting up images ---
 
 Done
@@ -65,3 +67,73 @@ read -P0xdc 32M 32k
 read -P0xcd 0x3ff0000 64k
 
 Done
+=== Test filter based fleecing ===
+
+--- Setting up images ---
+
+Done
+
+--- Launching VM ---
+
+Done
+
+--- Setting up Fleecing Graph ---
+
+{"return": {}}
+{"return": {}}
+{"return": {}}
+
+--- Setting up NBD Export ---
+
+{"return": {}}
+{"return": {}}
+
+--- Sanity Check ---
+
+read -P0x5d 0 64k
+read -P0xd5 1M 64k
+read -P0xdc 32M 64k
+read -P0xcd 0x3ff0000 64k
+read -P0 0x00f8000 32k
+read -P0 0x2010000 32k
+read -P0 0x3fe0000 64k
+
+--- Testing COW ---
+
+write -P0xab 0 64k
+{"return": ""}
+write -P0xad 0x00f8000 64k
+{"return": ""}
+write -P0x1d 0x2008000 64k
+{"return": ""}
+write -P0xea 0x3fe0000 64k
+{"return": ""}
+
+--- Verifying Data ---
+
+read -P0x5d 0 64k
+read -P0xd5 1M 64k
+read -P0xdc 32M 64k
+read -P0xcd 0x3ff0000 64k
+read -P0 0x00f8000 32k
+read -P0 0x2010000 32k
+read -P0 0x3fe0000 64k
+
+--- Cleanup ---
+
+{"return": {}}
+{"return": {}}
+{"return": {}}
+{"return": {}}
+
+--- Confirming writes ---
+
+read -P0xab 0 64k
+read -P0xad 0x00f8000 64k
+read -P0x1d 0x2008000 64k
+read -P0xea 0x3fe0000 64k
+read -P0xd5 0x108000 32k
+read -P0xdc 32M 32k
+read -P0xcd 0x3ff0000 64k
+
+Done
-- 
2.29.2



  parent reply	other threads:[~2021-08-24  9:08 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24  8:38 [PATCH v8 00/34] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 01/34] block: introduce bdrv_replace_child_bs() Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 02/34] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 03/34] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 04/34] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 05/34] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 06/34] block-copy: move detecting fleecing scheme to block-copy Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 07/34] block/block-copy: introduce block_copy_set_copy_opts() Vladimir Sementsov-Ogievskiy
2021-08-24 13:32   ` Hanna Reitz
2021-08-24  8:38 ` [PATCH v8 08/34] block/backup: set copy_range and compress after filter insertion Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 09/34] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-09-01 11:57   ` Hanna Reitz
2021-09-01 12:04     ` Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 10/34] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 11/34] block/copy-before-write: drop extra bdrv_unref on failure path Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 12/34] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 13/34] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 14/34] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 15/34] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 16/34] block/copy-before-write: cbw_init(): use file child after attaching Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 17/34] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 18/34] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 19/34] block/copy-before-write: initialize block-copy bitmap Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 20/34] block/block-copy: make setting progress optional Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 21/34] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 22/34] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 23/34] python/qemu/machine.py: refactor _qemu_args() Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 24/34] python/qemu/machine: QEMUMachine: improve qmp() method Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 25/34] python:QEMUMachine: template typing for self returning methods Vladimir Sementsov-Ogievskiy
2021-08-24 13:56   ` Hanna Reitz
2021-08-24  8:38 ` [PATCH v8 26/34] iotests/222: fix pylint and mypy complains Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 27/34] iotests/222: constantly use single quotes for strings Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 28/34] iotests: move 222 to tests/image-fleecing Vladimir Sementsov-Ogievskiy
2021-09-01 12:37   ` Hanna Reitz
2021-09-01 12:47     ` Vladimir Sementsov-Ogievskiy
2021-09-01 12:54       ` Hanna Reitz
2021-09-01 13:00     ` Daniel P. Berrangé
2021-08-24  8:38 ` [PATCH v8 29/34] iotests.py: hmp_qemu_io: support qdev Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 30/34] iotests/image-fleecing: proper source device Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 31/34] iotests/image-fleecing: rename tgt_node Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` [PATCH v8 32/34] iotests/image-fleecing: prepare for adding new test-case Vladimir Sementsov-Ogievskiy
2021-08-24  8:38 ` Vladimir Sementsov-Ogievskiy [this message]
2021-08-24  8:38 ` [PATCH v8 34/34] block/block-copy: block_copy_state_new(): drop extra arguments Vladimir Sementsov-Ogievskiy
2021-08-24 14:05   ` Hanna Reitz
2021-08-24 15:51 ` [PATCH v8 00/34] block: publish backup-top filter Hanna Reitz
2021-08-24 16:24   ` 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=20210824083856.17408-34-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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).