From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 7 Mar 2019 13:12:28 +0000 (+0800)
Subject: qa/cephfs: relax min_caps_per_client check
X-Git-Tag: v14.2.0~70^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26818%2Fhead;p=ceph.git

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" <zyan@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_client_limits.py b/qa/tasks/cephfs/test_client_limits.py
index bc029cd8a5ab8..706f4af0addd3 100644
--- a/qa/tasks/cephfs/test_client_limits.py
+++ b/qa/tasks/cephfs/test_client_limits.py
@@ -86,9 +86,7 @@ class TestClientLimits(CephFSTestCase):
         # which depend on the caps outstanding, cache size and overall ratio
         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 num_caps < cache_size:
                 return True
@@ -253,9 +251,7 @@ class TestClientLimits(CephFSTestCase):
         mount_a_client_id = self.mount_a.get_global_id()
         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_max_caps_per_client:
+            if num_caps <= mds_max_caps_per_client:
                 return True
             else:
                 return False