From: Venky Shankar <vshankar@redhat.com>
Date: Wed, 15 Jan 2020 15:41:14 +0000 (-0500)
Subject: test: query using mds id, not rank
X-Git-Tag: v14.2.10~168^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43dcbcfdaaec518351fddb5295f80f024b0ebc55;p=ceph.git

test: query using mds id, not rank

Fixes: http://tracker.ceph.com/issues/42835
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit fb4cd42cbcdaa4812838b846ae33ee26356ce733)
---

diff --git a/qa/tasks/cephfs/test_scrub_checks.py b/qa/tasks/cephfs/test_scrub_checks.py
index d6947805347d..f36b2303cad7 100644
--- a/qa/tasks/cephfs/test_scrub_checks.py
+++ b/qa/tasks/cephfs/test_scrub_checks.py
@@ -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"