From 88df47230b5ad85e95b0be2eca6f5763914b175c Mon Sep 17 00:00:00 2001 From: Sridhar Seshasayee Date: Wed, 17 Mar 2021 01:18:40 +0530 Subject: [PATCH] qa/tasks: Add additional wait_for_clean() check in lost_unfound tasks. At the end of the lost_unfound tests add an additional wait_for_clean() check to ensure that recoveries get enough time to complete before proceeding and avoid failures down the line. For e.g. failure like "Scrubbing terminated -- not all pgs were active and clean." is because recoveries on the PGs did not get sufficient time to complete even though they were bound to eventually complete. Fixes: https://tracker.ceph.com/issues/49844 Signed-off-by: Sridhar Seshasayee --- qa/tasks/ec_lost_unfound.py | 1 + qa/tasks/lost_unfound.py | 1 + qa/tasks/rep_lost_unfound_delete.py | 1 + 3 files changed, 3 insertions(+) diff --git a/qa/tasks/ec_lost_unfound.py b/qa/tasks/ec_lost_unfound.py index 71068692d0a..57a9364eceb 100644 --- a/qa/tasks/ec_lost_unfound.py +++ b/qa/tasks/ec_lost_unfound.py @@ -156,3 +156,4 @@ def task(ctx, config): manager.wait_till_osd_is_up(1) manager.wait_for_clean() run.wait(procs) + manager.wait_for_clean() diff --git a/qa/tasks/lost_unfound.py b/qa/tasks/lost_unfound.py index ec101b2041c..5a9142a70a1 100644 --- a/qa/tasks/lost_unfound.py +++ b/qa/tasks/lost_unfound.py @@ -177,3 +177,4 @@ def task(ctx, config): manager.wait_till_osd_is_up(1) manager.wait_for_clean() run.wait(procs) + manager.wait_for_clean() diff --git a/qa/tasks/rep_lost_unfound_delete.py b/qa/tasks/rep_lost_unfound_delete.py index 893f76ea195..8e99ade27c1 100644 --- a/qa/tasks/rep_lost_unfound_delete.py +++ b/qa/tasks/rep_lost_unfound_delete.py @@ -175,4 +175,5 @@ def task(ctx, config): manager.wait_till_osd_is_up(1) manager.wait_for_clean() run.wait(procs) + manager.wait_for_clean()