From 8d9caddca60b2186c678223052326b6c9f6fdc3b Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 14 Jan 2020 16:10:53 -0800 Subject: [PATCH] qa: save MDS epoch barrier Rather than verify the latest OSDMap is the same as the rank's osdmap_epoch_barrier, just use the rank's version. The OSDMap may change out-of-band with the test startup and thus the epoch's would diverge. The file system and rank is fresh for each test so there's no reason to care if the MDS barrier is one epoch behind the latest. Fixes: https://tracker.ceph.com/issues/43554 Signed-off-by: Patrick Donnelly --- qa/tasks/cephfs/test_full.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/qa/tasks/cephfs/test_full.py b/qa/tasks/cephfs/test_full.py index 93b583574ff38..10f111ae63527 100644 --- a/qa/tasks/cephfs/test_full.py +++ b/qa/tasks/cephfs/test_full.py @@ -30,21 +30,10 @@ class FullnessTestCase(CephFSTestCase): def setUp(self): CephFSTestCase.setUp(self) - # These tests just use a single active MDS throughout, so remember its ID - # for use in mds_asok calls - self.active_mds_id = self.fs.get_active_names()[0] + mds_status = self.fs.rank_asok(["status"]) # Capture the initial OSD map epoch for later use - self.initial_osd_epoch = json.loads( - self.fs.mon_manager.raw_cluster_cmd("osd", "dump", "--format=json").strip() - )['epoch'] - - # Check the initial barrier epoch on the MDS: this should be - # set to the latest map at MDS startup. We do this check in - # setUp to get in there before subclasses might touch things - # in their own setUp functions. - self.assertGreaterEqual(self.fs.mds_asok(["status"], mds_id=self.active_mds_id)['osdmap_epoch_barrier'], - self.initial_osd_epoch) + self.initial_osd_epoch = mds_status['osdmap_epoch_barrier'] def test_barrier(self): """ -- 2.39.5