From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 27 Sep 2017 16:29:39 +0000 (-0700)
Subject: mds: fix conf types
X-Git-Tag: v12.2.2~81^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=913c72d96a6c405b4e4fe57abcfbf58d53a66e63;p=ceph.git

mds: fix conf types

This correct an assertion failure.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit bfc490249566356cff785f2f89dc03d69af322da)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index d6adab257c5e..1990e761bf23 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5749,7 +5749,7 @@ std::vector<Option> get_mds_options() {
     .set_default(1024)
     .set_description(""),
  
-    Option("mds_min_caps_per_client", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+    Option("mds_min_caps_per_client", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(100)
     .set_description("Set the minimum cache number of client"),
 
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d299aa3aca2d..91017396a2b1 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1085,8 +1085,8 @@ 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 = (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");
+  uint64_t max_caps_per_client = Capability::count() * g_conf->get_val<double>("mds_max_ratio_caps_per_client");
+  uint64_t min_caps_per_client = g_conf->get_val<uint64_t>("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;