From: Samuel Just Date: Thu, 19 Nov 2015 23:06:20 +0000 (-0800) Subject: ceph_manager: do_pg_scrub: keep scrubbing until it's done X-Git-Tag: v0.94.10~27^2^2~15^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5606a87f8de73f3d17b0b60fef1d6801b0ce2bbb;p=ceph.git ceph_manager: do_pg_scrub: keep scrubbing until it's done The ceph pg scrub ... command isn't really guarranteed to start a scrub, keep reissuing it until the scrub actually happens. Related: #12746 Signed-off-by: Samuel Just (cherry picked from commit 89dcc0daf31eabc04810f759e0694dc8303fee4d) --- diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index ca8c9f69339..962ae8d8300 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -1316,9 +1316,9 @@ class CephManager: Scrub pg and wait for scrubbing to finish """ init = self.get_last_scrub_stamp(pool, pgnum) - self.raw_cluster_cmd('pg', stype, self.get_pgid(pool, pgnum)) while init == self.get_last_scrub_stamp(pool, pgnum): self.log("waiting for scrub type %s" % (stype,)) + self.raw_cluster_cmd('pg', stype, self.get_pgid(pool, pgnum)) time.sleep(10) def get_single_pg_stats(self, pgid):