tasks/cephfs: fix wait_for_state timing

Return actual elapsed wallclock time instead of
the number of times we polled.

Fixes: #14257
Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/tasks/cephfs/filesystem.py b/tasks/cephfs/filesystem.py
index 9adc8afd509a47e854764ea0e4ffd327b9f3ddad..368f2c476a3e90382d448d5d10404915159d7b32 100644 (file)
--- a/tasks/cephfs/filesystem.py
+++ b/tasks/cephfs/filesystem.py
@@ -475,9 +475,8 @@ class Filesystem(object):
         :return: number of seconds waited, rounded down to integer
         """
 
-        elapsed = 0
+        started_at = time.time()
         while True:
-
             if mds_id is not None:
                 # mds_info is None if no daemon with this ID exists in the map
                 mds_info = self.mon_manager.get_mds_status(mds_id)
@@ -495,6 +494,7 @@ class Filesystem(object):
                     current_state = None
                 log.info("mapped states {0} to {1}".format(states, current_state))
 
+            elapsed = time.time() - started_at
             if current_state == goal_state:
                 log.info("reached state '{0}' in {1}s".format(current_state, elapsed))
                 return elapsed
@@ -508,7 +508,6 @@ class Filesystem(object):
                     ))
             else:
                 time.sleep(1)
-                elapsed += 1
 
     def _read_data_xattr(self, ino_no, xattr_name, type, pool):
         mds_id = self.mds_ids[0]