RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35486 from jdurgin/wip-radosbench-qa

Browse Source 
qa/tasks/radosbench: use long form of option for compatibility

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
This commit is contained in:
Kefu Chai 2020-06-11 09:28:11 +08:00 committed by GitHub
commit 4fb37f881f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qa/tasks/radosbench.py
View File

@ -83,15 +83,13 @@ def task(ctx, config):
else:
pool = manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
size = config.get('size', 65536)
concurrency = config.get('concurrency', 16)
osize = config.get('objectsize', 65536)
sizeargs = ['-b', str(size)]
if osize != 0 and osize != size:
# only use -O if this varies from size. kludgey workaround the
# fact that -O was -o in older releases.
sizeargs.extend(['-O', str(osize)])
if osize == 0:
objectsize = []
else:
objectsize = ['--object-size', str(osize)]
size = ['-b', str(config.get('size', 65536))]
# If doing a reading run then populate data
if runtype != "write":
proc = remote.run(
@ -102,9 +100,9 @@ def task(ctx, config):
'{tdir}/archive/coverage',
'rados',
'--no-log-to-stderr',
'--name', role]
+ sizeargs +
['-t', str(concurrency)] +
'--name', role] +
['-t', str(concurrency)]
+ size + objectsize +
['-p' , pool,
'bench', str(60), "write", "--no-cleanup"
]).format(tdir=testdir),
@ -112,7 +110,8 @@ def task(ctx, config):
logger=log.getChild('radosbench.{id}'.format(id=id_)),
wait=True
)
sizeargs = []
size = []
objectsize = []
proc = remote.run(
args=[
@ -123,7 +122,7 @@ def task(ctx, config):
'rados',
'--no-log-to-stderr',
'--name', role]
+ sizeargs +
+ size + objectsize +
['-p' , pool,
'bench', str(config.get('time', 360)), runtype,
] + write_to_omap + cleanup).format(tdir=testdir),