From: Samuel Just <samuel.just@dreamhost.com>
Date: Tue, 24 Jan 2012 19:28:38 +0000 (-0800)
Subject: CephManager: base timeout on time since last change in active+clean
X-Git-Tag: 1.1.0~2658
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4aa9ca45519832625f42517747b6ca1993757805;p=teuthology.git

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 860844f5f1..99eb8a7dbf 100644
--- 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!")