From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 17 Jan 2020 21:49:16 +0000 (-0800)
Subject: Merge pull request #31802 from batrick/i42943
X-Git-Tag: v14.2.8~20^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a4e0468c0e52600f882dd54166e5fde31f95286;p=ceph.git

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>
---

8a4e0468c0e52600f882dd54166e5fde31f95286
diff --cc src/mds/MDCache.cc
index 2200f1ab794,5538e70e9d6..952c54018ee
--- a/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;
          }