From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 30 Mar 2021 03:07:25 +0000 (-0700)
Subject: mds: remove extra heap release
X-Git-Tag: v15.2.13~12^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b5f2b6ae8b29b07ea7134313dfdb10d4833a3e1;p=ceph.git

mds: remove extra heap release

We now regularly do this unconditionally in the MDS, see the upkeep
thread.

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

Conflicts:
	src/mds/MDCache.cc
- octopus has a line, in->maybe_ephemeral_dist(false);, which is not there in
  master
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 73ca762962f6..a187f952154f 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -324,10 +324,6 @@ void MDCache::add_inode(CInode *in)
       base_inodes.insert(in);
   }
 
-  if (cache_toofull()) {
-    exceeded_size_limit = true;
-  }
-
   in->maybe_ephemeral_dist(false);
 }
 
@@ -7788,20 +7784,6 @@ void MDCache::check_memory_usage()
   if (cache_toofull()) {
     mds->server->recall_client_state(nullptr, Server::RecallFlags::TRIM);
   }
-
-  // If the cache size had exceeded its limit, but we're back in bounds
-  // now, free any unused pool memory so that our memory usage isn't
-  // permanently bloated.
-  if (exceeded_size_limit && !cache_toofull()) {
-    // Only do this once we are back in bounds: otherwise the releases would
-    // slow down whatever process caused us to exceed bounds to begin with
-    if (ceph_using_tcmalloc()) {
-      dout(5) << "check_memory_usage: releasing unused space from tcmalloc"
-	      << dendl;
-      ceph_heap_release_free_memory();
-    }
-    exceeded_size_limit = false;
-  }
 }
 
 
diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 2d68d84d41b8..6d34aeee7537 100644
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -1147,7 +1147,6 @@ class MDCache {
   std::unique_ptr<PerfCounters> logger;
 
   Filer filer;
-  bool exceeded_size_limit = false;
   std::array<xlist<ClientLease*>, client_lease_pools> client_leases{};
 
   /* subtree keys and each tree's non-recursive nested subtrees (the "bounds") */