Skip to content

Commit

Permalink
ceph_manager: do_pg_scrub: keep scrubbing until it's done
Browse files Browse the repository at this point in the history
The ceph pg scrub ... command isn't really guarranteed to
start a scrub, keep reissuing it until the scrub actually
happens.

Related: ceph#12746
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 89dcc0d)
  • Loading branch information
athanatos authored and smithfarm committed Jul 28, 2016
1 parent 32014ad commit 5606a87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tasks/ceph_manager.py
Expand Up @@ -1316,9 +1316,9 @@ def do_pg_scrub(self, pool, pgnum, stype):
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):
Expand Down

0 comments on commit 5606a87

Please sign in to comment.