From 8d9d724b7f2f6c2984b0ee58a5a91f79820719f2 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 19 May 2014 14:09:51 -0700 Subject: [PATCH] ceph_manager: reset timeout if we are making progress in wait_for_recovery Signed-off-by: Samuel Just --- teuthology/task/ceph_manager.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 046ed644b5984..c059ec46f5a46 100644 --- a/teuthology/task/ceph_manager.py +++ b/teuthology/task/ceph_manager.py @@ -1119,8 +1119,13 @@ class CephManager: num_active_recovered = self.get_num_active_recovered() while not self.is_recovered(): if timeout is not None: - assert time.time() - start < timeout, \ - 'failed to recover before timeout expired' + if self.get_is_making_recovery_progress(): + self.log("making progress, resetting timeout") + start = time.time() + else: + self.log("no progress seen, keeping timeout for now") + assert time.time() - start < timeout, \ + 'failed to recover before timeout expired' cur_active_recovered = self.get_num_active_recovered() if cur_active_recovered != num_active_recovered: start = time.time() -- 2.39.5