From: Milind Changire <mchangir@redhat.com>
Date: Wed, 28 Sep 2022 18:46:12 +0000 (+0530)
Subject: qa: wait for scrub to finish
X-Git-Tag: v17.2.6~171^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F49459%2Fhead;p=ceph.git

qa: wait for scrub to finish

Wait for scrub to finish during test_scrub_pause_and_resume_with_abort
which otherwise races and fails with an incorrect assertion.

Fixes: https://tracker.ceph.com/issues/48812
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 899029f2b63aa4606b4f01ac762ec50d730ab878)
---

diff --git a/qa/tasks/cephfs/test_scrub_checks.py b/qa/tasks/cephfs/test_scrub_checks.py
index ac86b24f0a57..0e84f7ed2645 100644
--- a/qa/tasks/cephfs/test_scrub_checks.py
+++ b/qa/tasks/cephfs/test_scrub_checks.py
@@ -139,8 +139,7 @@ done
 
         # resume and verify
         self._resume_scrub(0)
-        out_json = self.fs.get_scrub_status()
-        self.assertTrue("no active" in out_json['status'])
+        self.assertTrue(self.fs.wait_until_scrub_complete(sleep=5, timeout=30))
 
         checked = self._check_task_status_na()
         self.assertTrue(checked)