From b5570238b68af378c6c1bf7cc315e443b785e147 Mon Sep 17 00:00:00 2001 From: Sridhar Seshasayee Date: Thu, 25 Mar 2021 18:07:49 +0530 Subject: [PATCH] qa/tasks: Add wait_for_clean() check prior to initiating scrubbing. Fixes: https://tracker.ceph.com/issues/49983 Signed-off-by: Sridhar Seshasayee --- qa/tasks/ceph.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index a13f06c73173b..9894addd7f144 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 -- 2.39.5