From 19480b9495c9f1d563ef23ecec108a9f85d3d43e Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Thu, 7 Mar 2019 21:12:28 +0800 Subject: [PATCH] qa/cephfs: relax min_caps_per_client check new kernel client proactively release caps. caps count can go below mds_min_caps_per_client Fixes: http://tracker.ceph.com/issues/38270 Signed-off-by: "Yan, Zheng" (cherry picked from commit 8e81bd74c59259a06f587bb425d58bf2b2176341) Conflicts: qa/tasks/cephfs/test_client_limits.py - mimic TestClientLimits does not have expected_caps method at all --- qa/tasks/cephfs/test_client_limits.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qa/tasks/cephfs/test_client_limits.py b/qa/tasks/cephfs/test_client_limits.py index 1f1d5467079..28d6adba8ef 100644 --- a/qa/tasks/cephfs/test_client_limits.py +++ b/qa/tasks/cephfs/test_client_limits.py @@ -87,9 +87,7 @@ class TestClientLimits(CephFSTestCase): recall_expected_value = int((1.0-mds_max_ratio_caps_per_client)*(open_files+2)) def expected_caps(): num_caps = self.get_session(mount_a_client_id)['num_caps'] - if num_caps < mds_min_caps_per_client: - raise RuntimeError("client caps fell below min!") - elif num_caps == mds_min_caps_per_client: + if num_caps <= mds_min_caps_per_client: return True elif recall_expected_value*.95 <= num_caps <= recall_expected_value*1.05: return True -- 2.47.3