From: ren.huanwen <ren.huanwen@zte.com.cn>
Date: Mon, 18 Sep 2017 07:14:19 +0000 (+0800)
Subject: mds: adding tunable features for caps_per_client
X-Git-Tag: v12.2.2~81^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a39ab633cb97fd4fa0e1ef3e0e2e56709f980857;p=ceph.git

mds: adding tunable features for caps_per_client

Sometimes we need to raise or lower the value of "max_caps_per_client" and
"min_caps_per_client" to improve recall_client_state efficiency

Signed-off-by: ren.huanwen <ren.huanwen@zte.com.cn>
(cherry picked from commit a07b376628505832f5528bd7f2b0faeabe9a5f5d)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 0be052e1bc55..8578d464cb9b 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5748,6 +5748,14 @@ std::vector<Option> get_mds_options() {
     Option("mds_client_writeable_range_max_inc_objs", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(1024)
     .set_description(""),
+    
+    Option("mds_min_caps_per_client", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+    .set_default(100)
+    .set_description("Set the minimum cache number of client"),
+
+    Option("mds_max_ratio_caps_per_client", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
+    .set_default(.8)
+    .set_description("Set the maximum cache number ratio of client"),
   });
 }
 
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 3d34bd4c1caa..400539984344 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1085,8 +1085,14 @@ void Server::recover_filelocks(CInode *in, bufferlist locks, int64_t client)
 void Server::recall_client_state(void)
 {
   /* try to recall at least 80% of all caps */
-  uint64_t max_caps_per_client = (Capability::count() * .8);
-  uint64_t min_caps_per_client = 100;
+  uint64_t max_caps_per_client = (uint64_t)(Capability::count() * g_conf->get_val<float>("mds_max_ratio_caps_per_client"));
+  uint64_t min_caps_per_client = (uint64_t)g_conf->get_val<int>("mds_min_caps_per_client");
+  if (max_caps_per_client < min_caps_per_client) {
+    dout(0) << "max_caps_per_client " << max_caps_per_client
+            << "<" << "min_caps_per_client " << min_caps_per_client << dendl;
+    max_caps_per_client = min_caps_per_client + 1;
+  }
+   
   /* unless this ratio is smaller: */
   /* ratio: determine the amount of caps to recall from each client. Use
    * percentage full over the cache reservation. Cap the ratio at 80% of client