thrasher: remove redundant wait_till_clean()

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index dff4c739c7269c191fb42d74c0c6aaf060f03575..60944f1277e05909e0f7365daaeb1719aa872fad 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -22,13 +22,6 @@ class Thrasher(gevent.Greenlet):
         gevent.Greenlet.__init__(self, self.do_thrash)
         self.start()
 
-    def wait_till_clean(self):
-        self.log("Waiting until clean")
-        while not self.ceph_manager.is_clean():
-            time.sleep(3)
-            print "..."
-        self.log("Clean!")
-
     def remove_osd(self):
         osd = random.choice(self.in_osds)
         self.log("Removing osd %s"%(str(osd),))
@@ -58,7 +51,7 @@ class Thrasher(gevent.Greenlet):
         while not self.stopping:
             self.log(" ".join([str(x) for x in ["in_osds: ", self.in_osds, " out_osds: ", self.out_osds]]))
             if random.uniform(0,1) < (float(DELAY)/CLEANINT):
-                self.wait_till_clean()
+                self.ceph_manager.wait_till_clean()
             if (len(self.out_osds) == 0):
                 self.remove_osd()
             elif (len(self.in_osds) <= 2):