]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: query using mds id, not rank 30704/head
authorVenky Shankar <vshankar@redhat.com>
Wed, 15 Jan 2020 15:41:14 +0000 (10:41 -0500)
committerVenky Shankar <vshankar@redhat.com>
Thu, 26 Mar 2020 02:45:13 +0000 (22:45 -0400)
Fixes: http://tracker.ceph.com/issues/42835
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit fb4cd42cbcdaa4812838b846ae33ee26356ce733)

qa/tasks/cephfs/test_scrub_checks.py

index d6947805347dac92a7f5fa8888e5dc3a23596089..f36b2303cad71f123804ebf78fb00232e2f6a69c 100644 (file)
@@ -32,7 +32,9 @@ class TestScrubControls(CephFSTestCase):
         return self.fs.rank_tell(["scrub", "status"])
     def _check_task_status(self, expected_status):
         task_status = self.fs.get_task_status("scrub status")
-        self.assertTrue(task_status['0'].startswith(expected_status))
+        active = self.fs.get_active_names()
+        log.debug("current active={0}".format(active))
+        self.assertTrue(task_status[active[0]].startswith(expected_status))
 
     def test_scrub_abort(self):
         test_dir = "scrub_control_test_path"