From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Jul 2017 16:13:45 +0000 (-0400)
Subject: qa/tasks/ceph_manager: wait longer for pg stats to flush
X-Git-Tag: v12.1.1~32^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=56e2965502f8c05e625ef25093a99a9c0f06c516;p=ceph-ci.git

qa/tasks/ceph_manager: wait longer for pg stats to flush

An ill-timed mgr restart could blow the current 15s wait.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index a8082a1cbb4..964dc73440f 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -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}