From: Samuel Just <sam.just@inktank.com>
Date: Wed, 30 Oct 2013 19:26:42 +0000 (-0700)
Subject: ceph_manager: remove 6116 workaround
X-Git-Tag: 1.1.0~1786
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed1d11ba9e45b2bdfb29bb93e60a2ffbfe86c8a3;p=teuthology.git

ceph_manager: remove 6116 workaround

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 286d0c8f8..804c8427d 100644
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -219,9 +219,6 @@ class Thrasher:
         self.ceph_manager.wait_for_clean(
             timeout=self.config.get('timeout')
             )
-        # now we wait 20s to ensure that any backfill peers have heard about
-        # the cleanness
-        time.sleep(20)
 
         self.log("Recovered, killing an osd")
         self.kill_osd(mark_down=True, mark_out=True)