qa/ceph_manager: check pg state again before timedout

Pg state maybe all in active+clean when no recovering going on,
so check it again before timedout.

Fixes: http://tracker.ceph.com/issues/21294
Signed-off-by: huangjun <huangjun@xsky.com>
(cherry picked from commit fa40add7f0123dfeac30986f3d53cdfa77736a87)

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 9da03bdd9082324689e018ebadd48aea84c2e423..db573a637d29ec0992b794535be00d6560584fa2 100644 (file)
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -2217,6 +2217,8 @@ class CephManager:
                 else:
                     self.log("no progress seen, keeping timeout for now")
                     if now - start >= timeout:
+                       if self.is_recovered():
+                           break
                         self.log('dumping pgs')
                         out = self.raw_cluster_cmd('pg', 'dump')
                         self.log(out)