backfill: wait for clean before writing+blackholing

If we have straggler pgs and blackhole osd.1, we can deadlock because we
need info from that osd to repeer and continue.  Make sure we're clean, and
then start the write + blackhole + kill test.

diff --git a/teuthology/task/backfill.py b/teuthology/task/backfill.py
index c8c30fc22b6ac486f9dd7ea9b68426e1a2582a72..b188ed58eb474da94903d5fa2905da768c63260b 100644 (file)
--- a/teuthology/task/backfill.py
+++ b/teuthology/task/backfill.py
@@ -64,6 +64,11 @@ def task(ctx, config):
     manager.kill_osd(0)
     manager.mark_down_osd(0)
 
+    # wait for everything to peer and be happy...
+    manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')
+    manager.raw_cluster_cmd('tell', 'osd.2', 'flush_pg_stats')
+    manager.wait_till_clean()
+
     # write some new data
     p = rados_start(mon, ['-p', 'data', 'bench', '30', 'write', '-b', '4096'])