From: Sridhar Seshasayee <sseshasa@redhat.com>
Date: Thu, 25 Mar 2021 12:37:49 +0000 (+0530)
Subject: qa/tasks: Add wait_for_clean() check prior to initiating scrubbing.
X-Git-Tag: v16.2.2~3^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40461%2Fhead;p=ceph.git

qa/tasks: Add wait_for_clean() check prior to initiating scrubbing.

Fixes: https://tracker.ceph.com/issues/49983
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit b5570238b68af378c6c1bf7cc315e443b785e147)
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index a13f06c73173..9894addd7f14 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1899,6 +1899,9 @@ def task(ctx, config):
             ctx.managers[config['cluster']].stop_pg_num_changes()
 
             if config.get('wait-for-scrub', True):
+                # wait for pgs to become active+clean in case any
+                # recoveries were triggered since the last health check
+                ctx.managers[config['cluster']].wait_for_clean()
                 osd_scrub_pgs(ctx, config)
 
             # stop logging health to clog during shutdown, or else we generate