From f4d527e7433c8cafa82a8f8f59a5b2b125f73119 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 17 Nov 2011 11:11:33 -0800 Subject: [PATCH] thrashosds: timeout for every clean check, not just the last one --- teuthology/task/ceph_manager.py | 4 +++- teuthology/task/thrashosds.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 0fb2b4ac0b3da..337f487783dbb 100644 --- a/teuthology/task/ceph_manager.py +++ b/teuthology/task/ceph_manager.py @@ -116,7 +116,9 @@ class Thrasher(gevent.Greenlet): "dead_osds: ", self.dead_osds, "live_osds: ", self.live_osds]])) if random.uniform(0,1) < (float(delay) / cleanint): - self.ceph_manager.wait_till_clean() + self.ceph_manager.wait_till_clean( + timeout=self.config.get('timeout') + ) self.choose_action()() time.sleep(delay) self.all_up() diff --git a/teuthology/task/thrashosds.py b/teuthology/task/thrashosds.py index de2d2a9888e29..6da7416c52ca7 100644 --- a/teuthology/task/thrashosds.py +++ b/teuthology/task/thrashosds.py @@ -41,8 +41,8 @@ def task(ctx, config): 0.75). timeout: (360) the number of seconds to wait for the cluster - to become clean before the task exits. If this doesn't happen, - an exception will be raised. + to become clean after each cluster change. If this doesn't + happen within the timeout, an exception will be raised. example: -- 2.39.5