mds: adapt drop cache for incremental trim

Signed-off-by: Patrick Donnelly <[email protected]>
atta · Jan 29, 2019 · b750b3b · b750b3b
1 parent 7bf2f31
commit b750b3b
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
@@ -379,13 +379,18 @@ class C_Drop_Cache : public MDSInternalContext {
   void trim_cache() {
     dout(20) << __func__ << dendl;
 
-    if (!mdcache->trim(UINT64_MAX)) {
-      cmd_err(f, "failed to trim cache");
-      complete(-EINVAL);
-      return;
+    auto [throttled, count] = mdcache->trim(UINT64_MAX);
+    dout(10) << __func__
+             << (throttled ? " (throttled)" : "")
+             << " trimmed " << count << " caps" << dendl;
+    if (throttled && count > 0) {
+      auto timer = new FunctionContext([this](int _) {
+        trim_cache();
+      });
+      mds->timer.add_event_after(1.0, timer);
+    } else {
+      cache_status();
     }
-
-    cache_status();
   }
 
   void cache_status() {