RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/infernalis'

Browse Source
This commit is contained in:
Sage Weil 2015-10-12 13:04:19 -04:00
commit 2545265f17
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/divergent_priors2.py
View File

@ -177,6 +177,7 @@ def task(ctx, config):
log.info("reviving divergent %d", divergent)
ctx.manager.revive_osd(divergent)
ctx.manager.wait_run_admin_socket('osd', divergent, ['dump_ops_in_flight'])
time.sleep(20);
log.info('allowing recovery')
# Set osd_recovery_delay_start back to 0 and kick the queue

14
tasks/radosbench.py
View File

@ -46,6 +46,7 @@ def task(ctx, config):
testdir = teuthology.get_testdir(ctx)
create_pool = config.get('create_pool', True)
for role in config.get('clients', ['client.0']):
assert isinstance(role, basestring)
PREFIX = 'client.'
@ -63,12 +64,11 @@ def task(ctx, config):
cleanup = []
if not config.get('cleanup', True):
cleanup = ['--no-cleanup']
pool = 'data'
if config.get('create_pool', True):
if config.get('pool'):
pool = config.get('pool')
if pool != 'data':
ctx.manager.create_pool(pool, erasure_code_profile_name=profile_name)
pool = config.get('pool', 'data')
if create_pool:
if pool != 'data':
ctx.manager.create_pool(pool, erasure_code_profile_name=profile_name)
else:
pool = ctx.manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
@ -99,5 +99,5 @@ def task(ctx, config):
log.info('joining radosbench (timing out after %ss)', timeout)
run.wait(radosbench.itervalues(), timeout=timeout)
if pool is not 'data':
if pool is not 'data' and create_pool:
ctx.manager.remove_pool(pool)

2
tasks/radosgw_admin.py
View File

@ -781,7 +781,7 @@ def task(ctx, config):
for obj in out:
# TESTCASE 'log-show','log','show','after activity','returns expected info'
if obj[:4] == 'meta' or obj[:4] == 'data':
if obj[:4] == 'meta' or obj[:4] == 'data' or obj[:18] == 'obj_delete_at_hint':
continue
(err, rgwlog) = rgwadmin(ctx, client, ['log', 'show', '--object', obj],