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, armbru@redhat.com, eblake@redhat.com,
	ehabkost@redhat.com, berrange@redhat.com, pbonzini@redhat.com,
	vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com,
	kwolf@redhat.com, den@openvz.org
Subject: [PATCH 21/21] itotests/222: add test-case for copy-before-write filter
Date: Mon, 17 May 2021 09:44:28 +0300	[thread overview]
Message-ID: <20210517064428.16223-23-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210517064428.16223-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
fore new recommended way of image fleecing.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/222     | 56 ++++++++++++++++++++++-------
 tests/qemu-iotests/222.out | 72 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222
index b48afe623e..8f8e1e4d7f 100755
--- a/tests/qemu-iotests/222
+++ b/tests/qemu-iotests/222
@@ -48,11 +48,13 @@ remainder = [("0xd5", "0x108000",  "32k"), # Right-end of partial-left [1]
              ("0xdc", "32M",       "32k"), # Left-end of partial-right [2]
              ("0xcd", "0x3ff0000", "64k")] # patterns[3]
 
-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:
+def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm):
+    if use_cbw:
+        log('=== Test filter based fleecing ===')
+    else:
+        log('=== Test backup(sync=none) based fleecing ===')
 
+    log('')
     log('--- Setting up images ---')
     log('')
 
@@ -69,7 +71,7 @@ with iotests.FilePath('base.img') as base_img_path, \
     log('--- Launching VM ---')
     log('')
 
-    vm.add_drive(base_img_path)
+    vm.add_drive(base_img_path, "node-name=node0")
     vm.launch()
     log('Done')
 
@@ -91,11 +93,22 @@ with iotests.FilePath('base.img') as base_img_path, \
         "backing": src_node,
     }))
 
-    # Establish COW from source to fleecing node
-    log(vm.qmp("blockdev-backup",
-               device=src_node,
-               target=tgt_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": tgt_node
+        }))
+
+        log(vm.qmp("qom-set", path="/machine/peripheral-anon/device[0]",
+                   property="drive", value="fl-cbw"))
+    else:
+        log(vm.qmp("blockdev-backup",
+                   device=src_node,
+                   target=tgt_node,
+                   sync="none"))
 
     log('')
     log('--- Setting up NBD Export ---')
@@ -139,9 +152,15 @@ with iotests.FilePath('base.img') as base_img_path, \
     log('--- Cleanup ---')
     log('')
 
-    log(vm.qmp('block-job-cancel', device=src_node))
-    log(vm.event_wait('BLOCK_JOB_CANCELLED'),
-        filters=[iotests.filter_qmp_event])
+    if use_cbw:
+        log(vm.qmp("qom-set", path="/machine/peripheral-anon/device[0]",
+                   property="drive", value="node0"))
+        log(vm.qmp("blockdev-del", node_name="fl-cbw"))
+    else:
+        log(vm.qmp('block-job-cancel', device=src_node))
+        log(vm.event_wait('BLOCK_JOB_CANCELLED'),
+            filters=[iotests.filter_qmp_event])
+
     log(vm.qmp('nbd-server-stop'))
     log(vm.qmp('blockdev-del', node_name=tgt_node))
     vm.shutdown()
@@ -157,3 +176,14 @@ with iotests.FilePath('base.img') as base_img_path, \
 
     log('')
     log('Done')
+
+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(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm)
+
+test(False)
+test(True)
diff --git a/tests/qemu-iotests/222.out b/tests/qemu-iotests/222.out
index 16643dde30..bdc0f7912f 100644
--- a/tests/qemu-iotests/222.out
+++ b/tests/qemu-iotests/222.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-05-17  7:02 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17  6:44 [PATCH 00/21] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH] block/copy-on-read: use bdrv_drop_filter() and drop s->active Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 01/21] block: introduce bdrv_replace_child_bs() Vladimir Sementsov-Ogievskiy
2021-05-17 12:09   ` Max Reitz
2021-05-17 14:30     ` Vladimir Sementsov-Ogievskiy
2021-05-17 15:51       ` Max Reitz
2021-05-17 18:05         ` Vladimir Sementsov-Ogievskiy
2021-05-19 10:12     ` Vladimir Sementsov-Ogievskiy
2021-05-19 11:11       ` Max Reitz
2021-05-19 11:14         ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 02/21] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-05-17 12:32   ` Max Reitz
2021-05-17  6:44 ` [PATCH 03/21] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-05-17 12:40   ` Max Reitz
2021-05-17 14:33     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 04/21] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-05-17 15:48   ` Max Reitz
2021-05-17 18:09     ` Vladimir Sementsov-Ogievskiy
2021-05-18  9:09       ` Max Reitz
2021-05-18  9:20         ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 05/21] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-05-17 16:05   ` Max Reitz
2021-05-17 19:42     ` Vladimir Sementsov-Ogievskiy
2021-05-18  9:37       ` Max Reitz
2021-05-17  6:44 ` [PATCH 06/21] block/backup: drop support for copy_range Vladimir Sementsov-Ogievskiy
2021-05-17 16:20   ` Max Reitz
2021-05-17  6:44 ` [PATCH 07/21] block-copy: always set BDRV_REQ_SERIALISING flag Vladimir Sementsov-Ogievskiy
2021-05-17 16:46   ` Max Reitz
2021-05-17  6:44 ` [PATCH 08/21] block/backup: stricter backup_calculate_cluster_size() Vladimir Sementsov-Ogievskiy
2021-05-17 16:57   ` Max Reitz
2021-05-17 19:53     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 09/21] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-05-17 17:09   ` Max Reitz
2021-05-17  6:44 ` [PATCH 10/21] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-05-18 11:10   ` Max Reitz
2021-05-18 12:16     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 11/21] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-05-18 11:47   ` Max Reitz
2021-05-18 12:21     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 12/21] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-05-18 12:35   ` Max Reitz
2021-05-17  6:44 ` [PATCH 13/21] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-05-18 12:53   ` Max Reitz
2021-05-17  6:44 ` [PATCH 14/21] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-05-18 13:01   ` Max Reitz
2021-05-17  6:44 ` [PATCH 15/21] block/copy-before-write: cbw_init(): use file child after attaching Vladimir Sementsov-Ogievskiy
2021-05-18 13:43   ` Max Reitz
2021-05-17  6:44 ` [PATCH 16/21] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-05-18 13:56   ` Max Reitz
2021-05-18 14:24     ` Vladimir Sementsov-Ogievskiy
2021-05-18 14:29       ` Max Reitz
2021-05-18 14:32         ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 17/21] block/block-copy: switch to fully set bitmap by default Vladimir Sementsov-Ogievskiy
2021-05-18 14:22   ` Max Reitz
2021-05-18 14:31     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 18/21] block/block-copy: make setting progress optional Vladimir Sementsov-Ogievskiy
2021-05-18 14:26   ` Max Reitz
2021-05-18 14:35     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` [PATCH 19/21] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-05-18 14:46   ` Max Reitz
2021-05-17  6:44 ` [PATCH 20/21] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-05-18 14:48   ` Max Reitz
2021-05-18 14:56     ` Vladimir Sementsov-Ogievskiy
2021-05-17  6:44 ` Vladimir Sementsov-Ogievskiy [this message]
2021-05-18 15:24   ` [PATCH 21/21] itotests/222: add test-case for " Max Reitz
2021-05-18 15:41     ` 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=20210517064428.16223-23-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=ehabkost@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).