From d53be13c04dd05a94862affd9fab56efa6c2b98e Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 6 Feb 2025 22:04:13 +0530 Subject: [PATCH] qa/cephfs: allow detecting MDS ID from FS object for method the.. tha generates MDS_CACHE_OVERSIZE warning. Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/test_admin.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py index d35c3ffde42..bf9acc407de 100644 --- a/qa/tasks/cephfs/test_admin.py +++ b/qa/tasks/cephfs/test_admin.py @@ -165,15 +165,21 @@ class TestAdminCommands(CephFSTestCase): if overwrites: self.run_ceph_cmd('osd', 'pool', 'set', n+"-data", 'allow_ec_overwrites', 'true') - def gen_health_warn_mds_cache_oversized(self, mds_id=None): + def gen_health_warn_mds_cache_oversized(self, mds_id=None, fs=None): health_warn = 'MDS_CACHE_OVERSIZED' # cs_name = config section name cs_name = None # declaring here in case no if/elif condition is true - if mds_id: + if mds_id and not fs: cs_name = f'mds.{mds_id}' - elif not mds_id: + elif not mds_id and fs: + mds_id = self.fs.get_active_names()[0] + cs_name = f'mds.{mds_id}' + elif not mds_id and not fs: cs_name = 'mds' + elif mds_id and fs: + raise RuntimeError('Makes no sense to pass both, mds_id as well as ' + 'FS object') self.config_set(cs_name, 'mds_cache_memory_limit', '1K') self.config_set(cs_name, 'mds_health_cache_threshold', '1.00000') -- 2.47.3