Skip to content

Commit ab643f7

Browse files
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 <[email protected]>
1 parent 7e584fa commit ab643f7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

qa/tasks/cephfs/test_admin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,7 +2283,7 @@ def test_with_health_warn_oversize_cache(self):
22832283
errmsg = 'mds_cache_oversized'
22842284
self.negtest_ceph_cmd(args=f'mds fail {active_mds_id}',
22852285
retval=1, errmsgs=errmsg)
2286-
self.run_ceph_cmd(f'mds fail {self.fs.name} --yes-i-really-mean-it')
2286+
self.run_ceph_cmd(f'mds fail {active_mds_id} --yes-i-really-mean-it')
22872287

22882288
def test_with_health_warn_trim(self):
22892289
'''
@@ -2307,7 +2307,7 @@ def test_with_health_warn_trim(self):
23072307
errmsg = 'mds_trim'
23082308
self.negtest_ceph_cmd(args=f'mds fail {active_mds_id}',
23092309
retval=1, errmsgs=errmsg)
2310-
self.run_ceph_cmd(f'mds fail {self.fs.name} --yes-i-really-mean-it')
2310+
self.run_ceph_cmd(f'mds fail {active_mds_id} --yes-i-really-mean-it')
23112311

23122312
def test_with_health_warn_with_2_active_MDSs(self):
23132313
'''
@@ -2345,5 +2345,5 @@ def test_with_health_warn_with_2_active_MDSs(self):
23452345
errmsgs=errmsg)
23462346
self.negtest_ceph_cmd(args=f'mds fail {hw_mds_id}', retval=1,
23472347
errmsgs=errmsg)
2348-
self.run_ceph_cmd('mds fail mds1_id --yes-i-really-mean-it')
2349-
self.run_ceph_cmd('mds fail mds2_id --yes-i-really-mean-it')
2348+
self.run_ceph_cmd(f'mds fail {mds1_id} --yes-i-really-mean-it')
2349+
self.run_ceph_cmd(f'mds fail {mds2_id} --yes-i-really-mean-it')

0 commit comments

Comments
 (0)