mds: Add fragment to scrub

Add dirfrag split and merge to scrub process.

Fixes: https://tracker.ceph.com/issues/57481
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit eadab41eab7220bd749a8217944157050c9513b4)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 0226ce32f719a70ebeb56c9a86f29c2b2a4dc0ac..aa1fc2f5808d1b6a5b95bae7471add5d87554fc7 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12638,6 +12638,9 @@ void MDCache::force_readonly()
   mds->mdlog->flush();
 }
 
+void MDCache::maybe_fragment(CDir *dir) {
+  mds->balancer->maybe_fragment(dir, false);
+}
 
 // ==============================================================
 // debug crap

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 7ac4f95627889ad3fc7afa3bc6fc091065152c29..a542745225f923102d4f7635a3b10c9d3f920ec8 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -275,6 +275,8 @@ class MDCache {
   bool is_readonly() { return readonly; }
   void force_readonly();
 
+  void maybe_fragment(CDir* dir);
+
   static file_layout_t gen_default_file_layout(const MDSMap &mdsmap);
   static file_layout_t gen_default_log_layout(const MDSMap &mdsmap);
 

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index bc70939784b84a00d67763ca6c6bd3fe360c8ed7..28392f533668c0df4e2f5716ac978ce4dd61d894 100644 (file)
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -470,6 +470,7 @@ void ScrubStack::scrub_dirfrag(CDir *dir, bool *done)
                  << " log and `damage ls` output for details";
   }
 
+  mdcache->maybe_fragment(dir);
   dir->scrub_finished();
   dir->auth_unpin(this);