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: v14.2.22~29^2~7^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=90feccafd5b0fb237ad2da3a1d0f341ee55213ae;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.h
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index eb0a706fe8f5..837c5f4dc252 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -301,10 +301,6 @@ void MDCache::add_inode(CInode *in)
     if (in->is_base())
       base_inodes.insert(in);
   }
-
-  if (cache_toofull()) {
-    exceeded_size_limit = true;
-  }
 }
 
 void MDCache::remove_inode(CInode *o) 
@@ -7666,20 +7662,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 ab5adb68d58e..10946be8fca5 100644
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -156,8 +156,6 @@ class MDCache {
 
   Filer filer;
 
-  bool exceeded_size_limit = false;
-
 private:
   uint64_t cache_inode_limit;
   uint64_t cache_memory_limit;