From: Sage Weil <sage@inktank.com>
Date: Fri, 25 Jan 2013 00:24:16 +0000 (-0800)
Subject: osd_recovery: fix up incomplete test
X-Git-Tag: 1.1.0~2362
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=006e70657d63405da1bed0661cebbea1be7adcf2;p=teuthology.git

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.
---

diff --git a/teuthology/task/osd_recovery.py b/teuthology/task/osd_recovery.py
index 1f013640d4..591aa6e62c 100644
--- a/teuthology/task/osd_recovery.py
+++ b/teuthology/task/osd_recovery.py
@@ -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)