From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com,
jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com
Subject: [PATCH v5 33/35] iotests/image-fleecing: rename tgt_node
Date: Thu, 10 Jun 2021 14:26:16 +0300 [thread overview]
Message-ID: <20210610112618.127378-34-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com>
Actually target of backup(sync=None) is not a final backup target:
image fleecing is intended to be used with external tool, which will
copy data from fleecing node to some real backup target.
Also, we are going to add a test case for "push backup with fleecing",
where instead of exporting fleecing node by NBD, we'll start a backup
job from fleecing node to real backup target.
To avoid confusion, let's rename temporary fleecing node now.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/tests/image-fleecing | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing
index 961941bb27..ec4ef5f3f6 100755
--- a/tests/qemu-iotests/tests/image-fleecing
+++ b/tests/qemu-iotests/tests/image-fleecing
@@ -71,6 +71,7 @@ with iotests.FilePath('base.img') as base_img_path, \
log('')
src_node = 'source'
+ tmp_node = 'temp'
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')
@@ -82,12 +83,11 @@ with iotests.FilePath('base.img') as base_img_path, \
log('--- Setting up Fleecing Graph ---')
log('')
- tgt_node = 'fleeceNode'
- # create tgt_node backed by src_node
+ # create tmp_node backed by src_node
log(vm.qmp('blockdev-add', {
'driver': 'qcow2',
- 'node-name': tgt_node,
+ 'node-name': tmp_node,
'file': {
'driver': 'file',
'filename': fleece_img_path,
@@ -99,19 +99,19 @@ with iotests.FilePath('base.img') as base_img_path, \
log(vm.qmp('blockdev-backup',
job_id='fleecing',
device=src_node,
- target=tgt_node,
+ target=tmp_node,
sync='none'))
log('')
log('--- Setting up NBD Export ---')
log('')
- nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path)
+ nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path)
log(vm.qmp('nbd-server-start',
{'addr': { 'type': 'unix',
'data': { 'path': nbd_sock_path } } }))
- log(vm.qmp('nbd-server-add', device=tgt_node))
+ log(vm.qmp('nbd-server-add', device=tmp_node))
log('')
log('--- Sanity Check ---')
@@ -149,7 +149,7 @@ with iotests.FilePath('base.img') as base_img_path, \
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=tgt_node))
+ log(vm.qmp('blockdev-del', node_name=tmp_node))
vm.shutdown()
log('')
--
2.29.2
next prev parent reply other threads:[~2021-06-10 11:56 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 11:25 [PATCH v5 00/35] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 01/35] block: rename bdrv_replace_child to bdrv_replace_child_tran Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 02/35] block: comment graph-modifying function not updating permissions Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 03/35] block: introduce bdrv_replace_child_bs() Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 04/35] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 05/35] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 06/35] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 07/35] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 08/35] block-copy: always set BDRV_REQ_SERIALISING flag Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 09/35] block/block-copy: introduce block_copy_set_copy_opts() Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 10/35] block/backup: set copy_range and compress after filter insertion Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 11/35] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 12/35] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 13/35] block/copy-before-write: drop extra bdrv_unref on failure path Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 14/35] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 15/35] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 16/35] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 17/35] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 18/35] block/copy-before-write: cbw_init(): use file child after attaching Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 19/35] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 20/35] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 21/35] block/copy-before-write: initialize block-copy bitmap Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 22/35] block/block-copy: make setting progress optional Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 23/35] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 24/35] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 25/35] python/qemu/machine.py: refactor _qemu_args() Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 26/35] python/qemu/machine: QEMUMachine: improve qmp() method Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 27/35] iotests.py: VM: add own __enter__ method Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 28/35] iotests/222: fix pylint and mypy complains Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 29/35] iotests/222: constantly use single quotes for strings Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 30/35] iotests: move 222 to tests/image-fleecing Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 31/35] iotests.py: hmp_qemu_io: support qdev Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 32/35] iotests/image-fleecing: proper source device Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` Vladimir Sementsov-Ogievskiy [this message]
2021-06-10 11:26 ` [PATCH v5 34/35] iotests/image-fleecing: prepare for adding new test-case Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 35/35] iotests/image-fleecing: add test-case for copy-before-write filter 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=20210610112618.127378-34-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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 read-only IMAP folder(s) and NNTP newsgroup(s).