thrashosds: wait for every pg to go active and clean before exiting

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 85f956563da2163d08440f81c926c84e70daf15c..26f65a08fa9830fdc12510889a433c5d72b5ed49 100644 (file)
--- 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 4c76a5e9812674b681b9f9f68b43190dc93b1cde..a941718077c0b9c8beea8fdbf5a0a8de0b240398 100644 (file)
--- 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()