]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: wait for scrub to finish 48218/head
authorMilind Changire <mchangir@redhat.com>
Wed, 28 Sep 2022 18:46:12 +0000 (00:16 +0530)
committerMilind Changire <mchangir@redhat.com>
Wed, 28 Sep 2022 18:46:12 +0000 (00:16 +0530)
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>
qa/tasks/cephfs/test_scrub_checks.py

index ac86b24f0a57f16ac26859408a072c5a8c7e5d1a..0e84f7ed2645cfdacc8b89f05359da68a1497595 100644 (file)
@@ -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)