From: Sage Weil <sage@redhat.com>
Date: Wed, 1 Aug 2018 14:29:15 +0000 (-0500)
Subject: mds/MDCache: fix mds_cache_memory_limit get_val<>
X-Git-Tag: v14.0.1~703^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0fe0ae76b7a7ba07929ebf475845068ceba3d7f3;p=ceph.git

mds/MDCache: fix mds_cache_memory_limit get_val<>

Fixes: 922bfc5f3b333f576a1444773fff6db7100dd24a
Fixes: http://tracker.ceph.com/issues/25215
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 99cebef66b73e..7526954f9926e 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -239,7 +239,7 @@ void MDCache::handle_conf_change(const ConfigProxy& conf,
   if (changed.count("mds_cache_size"))
     cache_inode_limit = g_conf().get_val<int64_t>("mds_cache_size");
   if (changed.count("mds_cache_memory_limit"))
-    cache_memory_limit = g_conf().get_val<uint64_t>("mds_cache_memory_limit");
+    cache_memory_limit = g_conf().get_val<Option::size_t>("mds_cache_memory_limit");
   if (changed.count("mds_cache_reservation"))
     cache_reservation = g_conf().get_val<double>("mds_cache_reservation");
   if (changed.count("mds_health_cache_threshold"))