Skip to content

Commit c3463d5

Browse files
committed
Merge PR ceph#57493 into main
* refs/pull/57493/head: qa/cephfs: pass MDS name, not FS name, to "ceph mds fail" cmd Reviewed-by: Patrick Donnelly <[email protected]>
2 parents eb10f3d + ab643f7 commit c3463d5

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
@@ -2405,7 +2405,7 @@ def test_with_health_warn_oversize_cache(self):
24052405
errmsg = 'mds_cache_oversized'
24062406
self.negtest_ceph_cmd(args=f'mds fail {active_mds_id}',
24072407
retval=1, errmsgs=errmsg)
2408-
self.run_ceph_cmd(f'mds fail {self.fs.name} --yes-i-really-mean-it')
2408+
self.run_ceph_cmd(f'mds fail {active_mds_id} --yes-i-really-mean-it')
24092409

24102410
def test_with_health_warn_trim(self):
24112411
'''
@@ -2429,7 +2429,7 @@ def test_with_health_warn_trim(self):
24292429
errmsg = 'mds_trim'
24302430
self.negtest_ceph_cmd(args=f'mds fail {active_mds_id}',
24312431
retval=1, errmsgs=errmsg)
2432-
self.run_ceph_cmd(f'mds fail {self.fs.name} --yes-i-really-mean-it')
2432+
self.run_ceph_cmd(f'mds fail {active_mds_id} --yes-i-really-mean-it')
24332433

24342434
def test_with_health_warn_with_2_active_MDSs(self):
24352435
'''
@@ -2467,5 +2467,5 @@ def test_with_health_warn_with_2_active_MDSs(self):
24672467
errmsgs=errmsg)
24682468
self.negtest_ceph_cmd(args=f'mds fail {hw_mds_id}', retval=1,
24692469
errmsgs=errmsg)
2470-
self.run_ceph_cmd('mds fail mds1_id --yes-i-really-mean-it')
2471-
self.run_ceph_cmd('mds fail mds2_id --yes-i-really-mean-it')
2470+
self.run_ceph_cmd(f'mds fail {mds1_id} --yes-i-really-mean-it')
2471+
self.run_ceph_cmd(f'mds fail {mds2_id} --yes-i-really-mean-it')

0 commit comments

Comments
 (0)