osd_recovery: fix up incomplete test

- stop rados bench from cleaning up
- flush pg stats
- fix sleep call

One or more of these helped fix this test, don't really care which.
This commit is contained in:
Sage Weil 2013-01-24 16:24:16 -08:00
parent 20af01f23b
commit 006e70657d

View File

@ -125,7 +125,7 @@ def test_incomplete_pgs(ctx, config):
)
while len(manager.get_osd_status()['up']) < 4:
manager.sleep(10)
time.sleep(10)
manager.raw_cluster_cmd('tell', 'osd.0', 'flush_pg_stats')
manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')
@ -137,10 +137,15 @@ def test_incomplete_pgs(ctx, config):
# move data off of osd.0, osd.1
manager.raw_cluster_cmd('osd', 'out', '0', '1')
manager.raw_cluster_cmd('tell', 'osd.0', 'flush_pg_stats')
manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')
manager.raw_cluster_cmd('tell', 'osd.2', 'flush_pg_stats')
manager.raw_cluster_cmd('tell', 'osd.3', 'flush_pg_stats')
manager.wait_for_clean()
# lots of objects in rbd (no pg log, will backfill)
p = rados_start(mon, ['-p', 'rbd', 'bench', '30', 'write', '-b', '4096'])
p = rados_start(mon, ['-p', 'rbd', 'bench', '60', 'write', '-b', '1',
'--no-cleanup'])
p.exitstatus.get()
# few objects in metadata pool (with pg log, normal recovery)