simplebench/bench-backup: add --compressed option
Allow bench compressed backup. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
parent
27eacb390e
commit
af2ac8514f
|
@ -23,7 +23,7 @@ import json
|
||||||
|
|
||||||
import simplebench
|
import simplebench
|
||||||
from results_to_text import results_to_text
|
from results_to_text import results_to_text
|
||||||
from bench_block_job import bench_block_copy, drv_file, drv_nbd
|
from bench_block_job import bench_block_copy, drv_file, drv_nbd, drv_qcow2
|
||||||
|
|
||||||
|
|
||||||
def bench_func(env, case):
|
def bench_func(env, case):
|
||||||
|
@ -37,29 +37,41 @@ def bench_func(env, case):
|
||||||
def bench(args):
|
def bench(args):
|
||||||
test_cases = []
|
test_cases = []
|
||||||
|
|
||||||
sources = {}
|
# paths with colon not supported, so we just split by ':'
|
||||||
targets = {}
|
dirs = dict(d.split(':') for d in args.dir)
|
||||||
for d in args.dir:
|
|
||||||
label, path = d.split(':') # paths with colon not supported
|
|
||||||
sources[label] = drv_file(path + '/test-source')
|
|
||||||
targets[label] = drv_file(path + '/test-target')
|
|
||||||
|
|
||||||
|
nbd_drv = None
|
||||||
if args.nbd:
|
if args.nbd:
|
||||||
nbd = args.nbd.split(':')
|
nbd = args.nbd.split(':')
|
||||||
host = nbd[0]
|
host = nbd[0]
|
||||||
port = '10809' if len(nbd) == 1 else nbd[1]
|
port = '10809' if len(nbd) == 1 else nbd[1]
|
||||||
drv = drv_nbd(host, port)
|
nbd_drv = drv_nbd(host, port)
|
||||||
sources['nbd'] = drv
|
|
||||||
targets['nbd'] = drv
|
|
||||||
|
|
||||||
for t in args.test:
|
for t in args.test:
|
||||||
src, dst = t.split(':')
|
src, dst = t.split(':')
|
||||||
|
|
||||||
test_cases.append({
|
if src == 'nbd' and dst == 'nbd':
|
||||||
'id': t,
|
raise ValueError("Can't use 'nbd' label for both src and dst")
|
||||||
'source': sources[src],
|
|
||||||
'target': targets[dst]
|
if (src == 'nbd' or dst == 'nbd') and not nbd_drv:
|
||||||
})
|
raise ValueError("'nbd' label used but --nbd is not given")
|
||||||
|
|
||||||
|
if src == 'nbd':
|
||||||
|
source = nbd_drv
|
||||||
|
else:
|
||||||
|
source = drv_file(dirs[src] + '/test-source')
|
||||||
|
|
||||||
|
if dst == 'nbd':
|
||||||
|
test_cases.append({'id': t, 'source': source, 'target': nbd_drv})
|
||||||
|
continue
|
||||||
|
|
||||||
|
fname = dirs[dst] + '/test-target'
|
||||||
|
if args.compressed:
|
||||||
|
fname += '.qcow2'
|
||||||
|
target = drv_file(fname)
|
||||||
|
if args.compressed:
|
||||||
|
target = drv_qcow2(target)
|
||||||
|
test_cases.append({'id': t, 'source': source, 'target': target})
|
||||||
|
|
||||||
binaries = [] # list of (<label>, <path>, [<options>])
|
binaries = [] # list of (<label>, <path>, [<options>])
|
||||||
for i, q in enumerate(args.env):
|
for i, q in enumerate(args.env):
|
||||||
|
@ -106,6 +118,13 @@ def bench(args):
|
||||||
elif opt.startswith('max-workers='):
|
elif opt.startswith('max-workers='):
|
||||||
x_perf['max-workers'] = int(opt.split('=')[1])
|
x_perf['max-workers'] = int(opt.split('=')[1])
|
||||||
|
|
||||||
|
backup_options = {}
|
||||||
|
if x_perf:
|
||||||
|
backup_options['x-perf'] = x_perf
|
||||||
|
|
||||||
|
if args.compressed:
|
||||||
|
backup_options['compress'] = True
|
||||||
|
|
||||||
if is_mirror:
|
if is_mirror:
|
||||||
assert not x_perf
|
assert not x_perf
|
||||||
test_envs.append({
|
test_envs.append({
|
||||||
|
@ -117,7 +136,7 @@ def bench(args):
|
||||||
test_envs.append({
|
test_envs.append({
|
||||||
'id': f'backup({label})\n' + '\n'.join(opts),
|
'id': f'backup({label})\n' + '\n'.join(opts),
|
||||||
'cmd': 'blockdev-backup',
|
'cmd': 'blockdev-backup',
|
||||||
'cmd-options': {'x-perf': x_perf} if x_perf else {},
|
'cmd-options': backup_options,
|
||||||
'qemu-binary': path
|
'qemu-binary': path
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -163,5 +182,9 @@ default port 10809). Use it in tests, label is "nbd"
|
||||||
p.add_argument('--test', nargs='+', help='''\
|
p.add_argument('--test', nargs='+', help='''\
|
||||||
Tests, in form source-dir-label:target-dir-label''',
|
Tests, in form source-dir-label:target-dir-label''',
|
||||||
action=ExtendAction)
|
action=ExtendAction)
|
||||||
|
p.add_argument('--compressed', help='''\
|
||||||
|
Use compressed backup. It automatically means
|
||||||
|
automatically creating qcow2 target with
|
||||||
|
lazy_refcounts for each test run''', action='store_true')
|
||||||
|
|
||||||
bench(p.parse_args())
|
bench(p.parse_args())
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
import subprocess
|
||||||
import socket
|
import socket
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
@ -77,11 +78,29 @@ def bench_block_job(cmd, cmd_args, qemu_args):
|
||||||
return {'seconds': (end_ms - start_ms) / 1000000.0}
|
return {'seconds': (end_ms - start_ms) / 1000000.0}
|
||||||
|
|
||||||
|
|
||||||
|
def get_image_size(path):
|
||||||
|
out = subprocess.run(['qemu-img', 'info', '--out=json', path],
|
||||||
|
stdout=subprocess.PIPE, check=True).stdout
|
||||||
|
return json.loads(out)['virtual-size']
|
||||||
|
|
||||||
|
|
||||||
# Bench backup or mirror
|
# Bench backup or mirror
|
||||||
def bench_block_copy(qemu_binary, cmd, cmd_options, source, target):
|
def bench_block_copy(qemu_binary, cmd, cmd_options, source, target):
|
||||||
"""Helper to run bench_block_job() for mirror or backup"""
|
"""Helper to run bench_block_job() for mirror or backup"""
|
||||||
assert cmd in ('blockdev-backup', 'blockdev-mirror')
|
assert cmd in ('blockdev-backup', 'blockdev-mirror')
|
||||||
|
|
||||||
|
if target['driver'] == 'qcow2':
|
||||||
|
try:
|
||||||
|
os.remove(target['file']['filename'])
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
subprocess.run(['qemu-img', 'create', '-f', 'qcow2',
|
||||||
|
target['file']['filename'],
|
||||||
|
str(get_image_size(source['filename']))],
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.DEVNULL, check=True)
|
||||||
|
|
||||||
source['node-name'] = 'source'
|
source['node-name'] = 'source'
|
||||||
target['node-name'] = 'target'
|
target['node-name'] = 'target'
|
||||||
|
|
||||||
|
@ -106,6 +125,10 @@ def drv_nbd(host, port):
|
||||||
'server': {'type': 'inet', 'host': host, 'port': port}}
|
'server': {'type': 'inet', 'host': host, 'port': port}}
|
||||||
|
|
||||||
|
|
||||||
|
def drv_qcow2(file):
|
||||||
|
return {'driver': 'qcow2', 'file': file}
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue