thrashosds: add delay option after recovery

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

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 7ddf79ecb7b433be1b4f3f02c73041c8c918bc6a..92c6c52941a264cb098ed3729676c93fca7c459d 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -23,6 +23,7 @@ class Thrasher:
         self.revive_timeout = self.config.get("revive_timeout", 75)
         if self.config.get('powercycle'):
             self.revive_timeout += 120
+        self.clean_wait = self.config.get('clean_wait', 0)
 
         num_osds = self.in_osds + self.out_osds
         self.max_pgs = self.config.get("max_pgs_per_pool_osd", 1200) * num_osds
@@ -250,6 +251,7 @@ class Thrasher:
                 self.ceph_manager.wait_for_recovery(
                     timeout=self.config.get('timeout')
                     )
+                time.sleep(self.clean_wait)
             self.choose_action()()
             time.sleep(delay)
         self.all_up()

diff --git a/teuthology/task/thrashosds.py b/teuthology/task/thrashosds.py
index 2c788d47b03c3426daae2bcdf2fda24ee4b250b1..ea49b4155ef4c1ba3dd0504d2ab15f66781dc352 100644 (file)
--- a/teuthology/task/thrashosds.py
+++ b/teuthology/task/thrashosds.py
@@ -71,6 +71,8 @@ def task(ctx, config):
     chance_inject_pause_short: (1) chance of injecting short stall
     chance_inject_pause_long: (0) chance of injecting long stall
 
+    clean_wait: (0) duration to wait before resuming thrashing once clean
+
     powercycle: (false) whether to power cycle the node instead
         of just the osd process. Note that this assumes that a single
         osd is the only important process on the node.