From 0db1d5b525195b48cbfc0d7b5bbb2e14e4eb9b80 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 6 Aug 2020 10:56:57 -0700 Subject: [PATCH] qa: use config_set/config_get It's simpler and does not require MDS restarts. Signed-off-by: Patrick Donnelly (cherry picked from commit edc5c14d1cb194760f91dcdb0385007df32aef45) Conflicts: qa/tasks/cephfs/test_client_limits.py --- qa/tasks/cephfs/test_client_limits.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/qa/tasks/cephfs/test_client_limits.py b/qa/tasks/cephfs/test_client_limits.py index 8fbb9e9bea8d2..b6b2ca121c1aa 100644 --- a/qa/tasks/cephfs/test_client_limits.py +++ b/qa/tasks/cephfs/test_client_limits.py @@ -39,17 +39,13 @@ class TestClientLimits(CephFSTestCase): :param use_subdir: whether to put test files in a subdir or use root """ - cache_size = open_files // 2 + self.config_set('mds', 'mds_cache_memory_limit', "1K") + self.config_set('mds', 'mds_recall_max_caps', int(open_files/2)) + self.config_set('mds', 'mds_recall_warning_threshold', open_files) - self.set_conf('mds', 'mds cache size', cache_size) - self.set_conf('mds', 'mds_recall_max_caps', open_files // 2) - self.set_conf('mds', 'mds_recall_warning_threshold', open_files) - self.fs.mds_fail_restart() - self.fs.wait_for_daemons() - - mds_min_caps_per_client = int(self.fs.get_config("mds_min_caps_per_client")) - mds_recall_warning_decay_rate = float(self.fs.get_config("mds_recall_warning_decay_rate")) - self.assertTrue(open_files >= mds_min_caps_per_client) + mds_min_caps_per_client = int(self.config_get('mds', "mds_min_caps_per_client")) + mds_recall_warning_decay_rate = float(self.config_get('mds', "mds_recall_warning_decay_rate")) + self.assertGreaterEqual(open_files, mds_min_caps_per_client) mount_a_client_id = self.mount_a.get_global_id() path = "subdir" if use_subdir else "." @@ -240,11 +236,9 @@ class TestClientLimits(CephFSTestCase): That the MDS will not let a client sit above mds_max_caps_per_client caps. """ - mds_min_caps_per_client = int(self.fs.get_config("mds_min_caps_per_client")) + mds_min_caps_per_client = int(self.config_get('mds', "mds_min_caps_per_client")) mds_max_caps_per_client = 2*mds_min_caps_per_client - self.set_conf('mds', 'mds_max_caps_per_client', mds_max_caps_per_client) - self.fs.mds_fail_restart() - self.fs.wait_for_daemons() + self.config_set('mds', 'mds_max_caps_per_client', mds_max_caps_per_client) self.mount_a.create_n_files("foo/", 3*mds_max_caps_per_client, sync=True) -- 2.39.5