Merge pull request #31802 from batrick/i42943

nautilus: mds: free heap memory may grow too large for some workloads

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>

diff --cc src/common/options.cc
Simple merge

diff --cc src/mds/MDCache.cc
index 2200f1ab7944f17cb5af32568557705a94ff844f,5538e70e9d6cc0ea1a675ccd33715b31270a4d68..952c54018ee377816f10d8600f390dde69120476
--- 1/src/mds/MDCache.cc
--- 2/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -175,9 -175,9 +175,10 @@@ MDCache::MDCache(MDSRank *m, PurgeQueu
            trim_client_leases();
            trim();
            check_memory_usage();
 -          mds->server->recall_client_state(nullptr, Server::RecallFlags::ENFORCE_MAX);
 +          auto flags = Server::RecallFlags::ENFORCE_MAX|Server::RecallFlags::ENFORCE_LIVENESS;
 +          mds->server->recall_client_state(nullptr, flags);
            upkeep_last_trim = clock::now();
+           upkeep_last_trim = now = clock::now();
          } else {
            dout(10) << "cache not ready for trimming" << dendl;
          }

diff --cc src/mds/MDCache.h
Simple merge