From: huangjun <huangjun@xsky.com>
Date: Tue, 19 Sep 2017 16:04:04 +0000 (+0800)
Subject: qa/ceph_manager: check pg state again before timedout
X-Git-Tag: v12.2.2~140^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82651da2d504913f2145085df8a89484308f3eba;p=ceph.git

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 9da03bdd9082..db573a637d29 100644
--- 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)