]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/ceph_manager: wait longer for pg stats to flush 16322/head
authorSage Weil <sage@redhat.com>
Thu, 13 Jul 2017 16:13:45 +0000 (12:13 -0400)
committerSage Weil <sage@redhat.com>
Thu, 13 Jul 2017 16:13:45 +0000 (12:13 -0400)
An ill-timed mgr restart could blow the current 15s wait.

Signed-off-by: Sage Weil <sage@redhat.com>
qa/tasks/ceph_manager.py

index a8082a1cbb4889151d8bc7fd47fc732c3b58d0d2..964dc73440fff8f27520b10e93286eac9d0cce08 100644 (file)
@@ -1177,7 +1177,7 @@ class CephManager:
                   "-w"],
             wait=False, stdout=StringIO(), stdin=run.PIPE)
 
-    def flush_pg_stats(self, osds, no_wait=None, wait_for_mon=3*5):
+    def flush_pg_stats(self, osds, no_wait=None, wait_for_mon=300):
         """
         Flush pg stats from a list of OSD ids, ensuring they are reflected
         all the way to the monitor.  Luminous and later only.
@@ -1189,7 +1189,7 @@ class CephManager:
                         stat seq from monitor anymore. in that case, you need
                         to pass a blacklist.
         :param wait_for_mon: wait for mon to be synced with mgr. 0 to disable
-                             it. (3 * mon_mgr_digest_period, by default)
+                             it. (5 min by default)
         """
         seq = {osd: self.raw_cluster_cmd('tell', 'osd.%d' % osd, 'flush_pg_stats')
                for osd in osds}