RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-07 01:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16265 from dzafman/wip-20470

Browse Source 
test: Fix reg11184 test to remove extraneous pg

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-07-11 13:46:33 -05:00 committed by GitHub
commit 64f47c89fe
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qa/tasks/reg11184.py
View File

@ -40,7 +40,8 @@ def task(ctx, config):
while len(manager.get_osd_status()['up']) < 3: while len(manager.get_osd_status()['up']) < 3:
time.sleep(10) time.sleep(10)
manager.flush_pg_stats([0, 1, 2]) osds = [0, 1, 2]
manager.flush_pg_stats(osds)
manager.raw_cluster_cmd('osd', 'set', 'noout') manager.raw_cluster_cmd('osd', 'set', 'noout')
manager.raw_cluster_cmd('osd', 'set', 'noin') manager.raw_cluster_cmd('osd', 'set', 'noin')
manager.raw_cluster_cmd('osd', 'set', 'nodown') manager.raw_cluster_cmd('osd', 'set', 'nodown')
@ -55,7 +56,9 @@ def task(ctx, config):
log.info('creating foo') log.info('creating foo')
manager.raw_cluster_cmd('osd', 'pool', 'create', 'foo', '1') manager.raw_cluster_cmd('osd', 'pool', 'create', 'foo', '1')
osds = [0, 1, 2] # Remove extra pool to simlify log output
manager.raw_cluster_cmd('osd', 'pool', 'delete', 'rbd', 'rbd', '--yes-i-really-really-mean-it')
for i in osds: for i in osds:
manager.set_config(i, osd_min_pg_log_entries=10) manager.set_config(i, osd_min_pg_log_entries=10)
manager.set_config(i, osd_max_pg_log_entries=10) manager.set_config(i, osd_max_pg_log_entries=10)
@ -175,7 +178,7 @@ def task(ctx, config):
# Remove the same pg that was exported # Remove the same pg that was exported
cmd = ((prefix + "--op remove --pgid 2.0"). cmd = ((prefix + "--op remove --pgid 2.0").
format(id=divergent, file=expfile)) format(id=divergent))
proc = exp_remote.run(args=cmd, wait=True, proc = exp_remote.run(args=cmd, wait=True,
check_status=False, stdout=StringIO()) check_status=False, stdout=StringIO())
assert proc.exitstatus == 0 assert proc.exitstatus == 0
@ -186,6 +189,13 @@ def task(ctx, config):
manager.mark_down_osd(non_divergent[0]) manager.mark_down_osd(non_divergent[0])
# manager.mark_out_osd(non_divergent[0]) # manager.mark_out_osd(non_divergent[0])
# An empty collection for pg 2.0 needs to be cleaned up
cmd = ((prefix + "--op remove --pgid 2.0").
format(id=non_divergent[0]))
proc = exp_remote.run(args=cmd, wait=True,
check_status=False, stdout=StringIO())
assert proc.exitstatus == 0
cmd = ((prefix + "--op import --file {file}"). cmd = ((prefix + "--op import --file {file}").
format(id=non_divergent[0], file=expfile)) format(id=non_divergent[0], file=expfile))
proc = exp_remote.run(args=cmd, wait=True, proc = exp_remote.run(args=cmd, wait=True,