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 <sseshasa@redhat.com>

diff --git a/qa/tasks/ec_lost_unfound.py b/qa/tasks/ec_lost_unfound.py
index 71068692d0a47cbfa1fccc99f3b0d046dca1dfc5..57a9364eceb1614eebdd4f1601031494de5af5b6 100644 (file)
--- 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 ec101b2041c3332ffe2e8635ca6b43b375b17137..5a9142a70a1bef16135b156beeaac3b1725dea5c 100644 (file)
--- 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 893f76ea195a357dfbd7212b161c02d621d22da3..8e99ade27c1654bdbeee51caf85e813aea768603 100644 (file)
--- 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()