rgw/test/multisite: use config's retry settings

Signed-off-by: Oguzhan Ozmen <oozmen@bloomberg.net>

diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py
index 1f0ad4251ca7e4ea6ff872af6ff5440190b98ac9..f69bcc85c103235f6596ac73efc22fc49b08a7ba 100644 (file)
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@ -457,11 +457,10 @@ def get_oldest_incremental_change_not_applied_epoch(zone):
     #    so the caller knows data sync is not making progress
     return 0.0
 
-def data_sync_making_progress(zone, time_window_sec=180, check_interval_sec=30):
-    deadline = time.time() + time_window_sec
+def data_sync_making_progress(zone):
     oldest_inc_change = None
     result = False
-    while time.time() < deadline:
+    for _ in range(config.checkpoint_retries):
         new_reading = get_oldest_incremental_change_not_applied_epoch(zone)
         if new_reading is not None:
             if oldest_inc_change is None:
@@ -470,7 +469,7 @@ def data_sync_making_progress(zone, time_window_sec=180, check_interval_sec=30):
                 result = True
                 oldest_inc_change = new_reading
                 break
-        time.sleep(check_interval_sec)
+        time.sleep(config.checkpoint_delay)
     return result or oldest_inc_change is None
 
 def set_master_zone(zone):