From 490dbb28ffa501d7041182332523eb5998d03777 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 9 Oct 2015 13:28:18 -0700 Subject: [PATCH 1/4] Specified 'hammer' branch Signed-off-by: Yuri Weinstein --- .../parallel/7-final-workload/rados_mon_thrash.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml index 1898bfafa9d..89745a55ba3 100644 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml +++ b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml @@ -4,6 +4,7 @@ tasks: revive_delay: 20 thrash_delay: 1 - workunit: + branch: hammer clients: client.1: - rados/test-upgrade-v9.0.1.sh From c0b0ec2831f410d89b695a1d08122334d8ee907a Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 1 Oct 2015 10:31:48 -0700 Subject: [PATCH 2/4] divergent_priors2: give divergent time to come up Fixes: #13322 Signed-off-by: Samuel Just --- tasks/divergent_priors2.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/divergent_priors2.py b/tasks/divergent_priors2.py index 0fc9a2f8d77..78d6043a536 100644 --- a/tasks/divergent_priors2.py +++ b/tasks/divergent_priors2.py @@ -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 From 174a74105fc32c7a87942f8e6befcac3a01125ff Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 8 Oct 2015 10:08:54 -0700 Subject: [PATCH 3/4] radosbench: use pool config even if create_pool is false Signed-off-by: Samuel Just --- tasks/radosbench.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/radosbench.py b/tasks/radosbench.py index 0924dab5295..bb1b8252403 100644 --- a/tasks/radosbench.py +++ b/tasks/radosbench.py @@ -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) From d1ada2e8dde0c3b1e7a4fb56c7a6574e7568ad57 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 12 Oct 2015 09:13:25 -0700 Subject: [PATCH 4/4] radosgw_admin: skip log objects that start with obj_delete_at_hint when testing radosgw-admin log show --object, don't use these objects Signed-off-by: Yehuda Sadeh --- tasks/radosgw_admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py index b6baa4cd4e5..7cea724ae23 100644 --- a/tasks/radosgw_admin.py +++ b/tasks/radosgw_admin.py @@ -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],