From b72c5a836307c1b6769e34c3447ecdf0d29fc37d Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Thu, 8 Sep 2011 14:07:23 -0700
Subject: [PATCH] thrashosds: wait for every pg to go active and clean before
 exiting

---
 teuthology/task/ceph_manager.py | 1 +
 teuthology/task/thrashosds.py   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 85f956563d..26f65a08fa 100644
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -73,6 +73,7 @@ class Thrasher(gevent.Greenlet):
                 x = random.choice([self.remove_osd, self.add_osd])
                 x()
             time.sleep(delay)
+        self.all_up()
 
 class CephManager:
     def __init__(self, controller, logger=None):
diff --git a/teuthology/task/thrashosds.py b/teuthology/task/thrashosds.py
index 4c76a5e981..a941718077 100644
--- a/teuthology/task/thrashosds.py
+++ b/teuthology/task/thrashosds.py
@@ -67,3 +67,4 @@ def task(ctx, config):
     finally:
         log.info('joining thrashosds')
         thrash_proc.do_join()
+        manager.wait_till_clean()
-- 
2.39.5