CephManager: base timeout on time since last change in active+clean

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 860844f5f169e79aa91a39585a1a0a0b8ed50d3f..99eb8a7dbfa4db80ec146de49c6208a265e98057 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -232,10 +232,15 @@ class CephManager:
     def wait_till_clean(self, timeout=None):
         self.log("waiting till clean")
         start = time.time()
+        num_active_clean = self.get_num_active_clean()
         while not self.is_clean():
             if timeout is not None:
                 assert time.time() - start < timeout, \
                     'failed to become clean before timeout expired'
+            cur_active_clean = self.get_num_active_clean()
+            if cur_active_clean != num_active_clean:
+                start = time.time()
+                num_active_clean = cur_active_clean
             time.sleep(3)
         self.log("clean!")