From 81e451e0c323d82123a9feb9489816cdedafbf4b Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sun, 15 Sep 2019 17:52:29 -0700 Subject: [PATCH] mds: drive cap recall while dropping cache STEADY does not imply TRIM. We want to always trim as many caps as possible. Introduced-by: be49866a150e04438cef971dec7948eaf34852fc Fixes: https://tracker.ceph.com/issues/41835 Signed-off-by: Patrick Donnelly --- src/mds/MDSRank.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 77696da76fc..4fa74fa87ae 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -329,7 +329,8 @@ private: auto duration = std::chrono::duration(now-recall_start).count(); MDSGatherBuilder *gather = new MDSGatherBuilder(g_ceph_context); - auto [throttled, count] = server->recall_client_state(gather, Server::RecallFlags::STEADY); + auto flags = Server::RecallFlags::STEADY|Server::RecallFlags::TRIM; + auto [throttled, count] = server->recall_client_state(gather, flags); dout(10) << __func__ << (throttled ? " (throttled)" : "") << " recalled " << count << " caps" << dendl; -- 2.39.5