From 76fab4804ff8463a3b757ae92baf59e2cb619c26 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Wed, 8 May 2024 19:29:11 +0530 Subject: [PATCH] qa/cephfs: pass MDS name, not FS name, to "ceph mds fail" cmd This issue was not caught in original QA run because "ceph mds fail" returns 0 even though MDS name received by it in argument is non-existent. This is done for the sake of idempotency, however it caused this bug to go uncaught. Fixea: https://tracker.ceph.com/issues/65864 Signed-off-by: Rishabh Dave (cherry picked from commit ab643f7a501797634a366fd29bf4acef6a8f0cf2) --- qa/tasks/cephfs/test_admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py index 44e0b7d0278..77eee685d05 100644 --- a/qa/tasks/cephfs/test_admin.py +++ b/qa/tasks/cephfs/test_admin.py @@ -1844,7 +1844,7 @@ class TestMDSFail(TestAdminCommands): errmsg = 'mds_cache_oversized' self.negtest_ceph_cmd(args=f'mds fail {active_mds_id}', retval=1, errmsgs=errmsg) - self.run_ceph_cmd(f'mds fail {self.fs.name} --yes-i-really-mean-it') + self.run_ceph_cmd(f'mds fail {active_mds_id} --yes-i-really-mean-it') def test_with_health_warn_trim(self): ''' @@ -1868,7 +1868,7 @@ class TestMDSFail(TestAdminCommands): errmsg = 'mds_trim' self.negtest_ceph_cmd(args=f'mds fail {active_mds_id}', retval=1, errmsgs=errmsg) - self.run_ceph_cmd(f'mds fail {self.fs.name} --yes-i-really-mean-it') + self.run_ceph_cmd(f'mds fail {active_mds_id} --yes-i-really-mean-it') def test_with_health_warn_with_2_active_MDSs(self): ''' @@ -1906,5 +1906,5 @@ class TestMDSFail(TestAdminCommands): errmsgs=errmsg) self.negtest_ceph_cmd(args=f'mds fail {hw_mds_id}', retval=1, errmsgs=errmsg) - self.run_ceph_cmd('mds fail mds1_id --yes-i-really-mean-it') - self.run_ceph_cmd('mds fail mds2_id --yes-i-really-mean-it') + self.run_ceph_cmd(f'mds fail {mds1_id} --yes-i-really-mean-it') + self.run_ceph_cmd(f'mds fail {mds2_id} --yes-i-really-mean-it') -- 2.39.5