From 899029f2b63aa4606b4f01ac762ec50d730ab878 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Thu, 29 Sep 2022 00:16:12 +0530 Subject: [PATCH] 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 --- qa/tasks/cephfs/test_scrub_checks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) -- 2.47.3