]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: prefer rank_asok
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 15 Jan 2020 00:10:34 +0000 (16:10 -0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 3 Feb 2020 15:31:26 +0000 (16:31 +0100)
This is a trivial refactor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b89f3ca9417c3e14cb9291c38db77d2ec0706977)

qa/tasks/cephfs/test_full.py

index 02ffadd96f52bb67ab0f989340d169e99bb887a1..e35ad024e4b2f8a4274756aba64d435b3329dd66 100644 (file)
@@ -91,7 +91,7 @@ class FullnessTestCase(CephFSTestCase):
         self.assertEqual(mount_b_epoch, mount_b_initial_epoch)
 
         # Set a barrier on the MDS
-        self.fs.mds_asok(["osdmap", "barrier", new_epoch.__str__()], mds_id=self.active_mds_id)
+        self.fs.rank_asok(["osdmap", "barrier", new_epoch.__str__()])
 
         # Do an operation on client B, witness that it ends up with
         # the latest OSD map from the barrier.  This shouldn't generate any
@@ -161,7 +161,7 @@ class FullnessTestCase(CephFSTestCase):
         # while in the full state.
         osd_epoch = json.loads(self.fs.mon_manager.raw_cluster_cmd("osd", "dump", "--format=json-pretty"))['epoch']
         self.wait_until_true(
-            lambda: self.fs.mds_asok(['status'], mds_id=self.active_mds_id)['osdmap_epoch'] >= osd_epoch,
+            lambda: self.fs.rank_asok(['status'])['osdmap_epoch'] >= osd_epoch,
             timeout=10)
 
         if not self.data_only:
@@ -190,7 +190,7 @@ class FullnessTestCase(CephFSTestCase):
         # be applying the free space policy
         osd_epoch = json.loads(self.fs.mon_manager.raw_cluster_cmd("osd", "dump", "--format=json-pretty"))['epoch']
         self.wait_until_true(
-            lambda: self.fs.mds_asok(['status'], mds_id=self.active_mds_id)['osdmap_epoch'] >= osd_epoch,
+            lambda: self.fs.rank_asok(['status'])['osdmap_epoch'] >= osd_epoch,
             timeout=10)
 
         # Now I should be able to write again