From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com,
mreitz@redhat.com
Subject: [PATCH v2 6/8] simplebench/bench-backup: support qcow2 source files
Date: Thu, 4 Mar 2021 13:17:36 +0300 [thread overview]
Message-ID: <20210304101738.20248-7-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210304101738.20248-1-vsementsov@virtuozzo.com>
Add support for qcow2 source. New option says to use test-source.qcow2
instead of test-source. Of course, test-source.qcow2 should be
precreated.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
scripts/simplebench/bench-backup.py | 5 +++++
scripts/simplebench/bench_block_job.py | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/scripts/simplebench/bench-backup.py b/scripts/simplebench/bench-backup.py
index fbc85f266f..a2120fcbf0 100755
--- a/scripts/simplebench/bench-backup.py
+++ b/scripts/simplebench/bench-backup.py
@@ -58,6 +58,8 @@ def bench(args):
if src == 'nbd':
source = nbd_drv
+ elif args.qcow2_sources:
+ source = drv_qcow2(drv_file(dirs[src] + '/test-source.qcow2'))
else:
source = drv_file(dirs[src] + '/test-source')
@@ -199,6 +201,9 @@ def __call__(self, parser, namespace, values, option_string=None):
Use compressed backup. It automatically means
automatically creating qcow2 target with
lazy_refcounts for each test run''', action='store_true')
+ p.add_argument('--qcow2-sources', help='''\
+Use test-source.qcow2 images as sources instead of
+test-source raw images''', action='store_true')
p.add_argument('--target-cache', help='''\
Setup cache for target nodes. Options:
direct: default, use O_DIRECT and aio=native
diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
index 71d2e489c8..4f03c12169 100755
--- a/scripts/simplebench/bench_block_job.py
+++ b/scripts/simplebench/bench_block_job.py
@@ -88,6 +88,11 @@ def get_image_size(path):
return json.loads(out)['virtual-size']
+def get_blockdev_size(obj):
+ img = obj['filename'] if 'filename' in obj else obj['file']['filename']
+ return get_image_size(img)
+
+
# Bench backup or mirror
def bench_block_copy(qemu_binary, cmd, cmd_options, source, target):
"""Helper to run bench_block_job() for mirror or backup"""
@@ -101,7 +106,7 @@ def bench_block_copy(qemu_binary, cmd, cmd_options, source, target):
subprocess.run(['qemu-img', 'create', '-f', 'qcow2',
target['file']['filename'],
- str(get_image_size(source['filename']))],
+ str(get_blockdev_size(source))],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, check=True)
--
2.29.2
next prev parent reply other threads:[~2021-03-04 10:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 10:17 [PATCH v2 0/8] simplebench improvements Vladimir Sementsov-Ogievskiy
2021-03-04 10:17 ` [PATCH v2 1/8] simplebench: bench_one(): add slow_limit argument Vladimir Sementsov-Ogievskiy
2021-03-05 1:22 ` John Snow
2021-03-05 9:03 ` Vladimir Sementsov-Ogievskiy
2021-03-05 16:25 ` John Snow
2021-03-04 10:17 ` [PATCH v2 2/8] simplebench: bench_one(): support count=1 Vladimir Sementsov-Ogievskiy
2021-03-05 1:23 ` John Snow
2021-03-04 10:17 ` [PATCH v2 3/8] simplebench/bench-backup: add --compressed option Vladimir Sementsov-Ogievskiy
2021-03-04 10:17 ` [PATCH v2 4/8] simplebench/bench-backup: add target-cache argument Vladimir Sementsov-Ogievskiy
2021-03-05 1:50 ` John Snow
2021-03-04 10:17 ` [PATCH v2 5/8] simplebench/bench_block_job: handle error in BLOCK_JOB_COMPLETED Vladimir Sementsov-Ogievskiy
2021-03-05 1:47 ` John Snow
2021-03-04 10:17 ` Vladimir Sementsov-Ogievskiy [this message]
2021-03-05 1:43 ` [PATCH v2 6/8] simplebench/bench-backup: support qcow2 source files John Snow
2021-03-04 10:17 ` [PATCH v2 7/8] simplebench/bench-backup: add --count and --no-initial-run Vladimir Sementsov-Ogievskiy
2021-03-05 1:37 ` John Snow
2021-03-05 9:09 ` Vladimir Sementsov-Ogievskiy
2021-03-04 10:17 ` [PATCH v2 8/8] simplebench/bench_block_job: drop caches before test run Vladimir Sementsov-Ogievskiy
2021-03-05 1:30 ` John Snow
2021-03-05 9:11 ` Vladimir Sementsov-Ogievskiy
2021-03-05 16:30 ` John Snow
2021-03-05 16:50 ` Vladimir Sementsov-Ogievskiy
2021-03-05 16:54 ` John Snow
2021-03-04 10:44 ` [PATCH v2 9/8] MAINTAINERS: update Benchmark util: add git tree 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=20210304101738.20248-7-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=den@openvz.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.