From: Samuel Just Date: Mon, 22 Jul 2013 23:24:41 +0000 (-0700) Subject: thrashosds: add delay option after recovery X-Git-Tag: 1.1.0~2059 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77cae4bf35424810f6c69218076246b677eb8fec;p=teuthology.git thrashosds: add delay option after recovery Signed-off-by: Samuel Just --- diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 7ddf79ecb..92c6c5294 100644 --- 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 2c788d47b..ea49b4155 100644 --- 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.