From: Venky Shankar <vshankar@redhat.com>
Date: Tue, 18 Mar 2025 09:01:59 +0000 (+0000)
Subject: Revert "mds/rejoin: Don't fetch the dir is already complete during rejoin"
X-Git-Tag: testing/wip-vshankar-testing-20260223.155722^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28acca4d47a3c17c8cf3acfda8700c225c33299a;p=ceph-ci.git

Revert "mds/rejoin: Don't fetch the dir is already complete during rejoin"

This reverts commit a069e7a6ac84424a92d059e1b1f6edb4efb36265.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 883f843f8fb..e7378273e08 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -6091,18 +6091,14 @@ bool MDCache::open_undef_inodes_dirfrags()
   map<CDir*, pair<bool, std::vector<dentry_key_t> > > fetch_queue;
   for (auto& dir : rejoin_undef_dirfrags) {
     ceph_assert(dir->get_version() == 0);
-    // No need to fetch if the dir is already complete
-    if (!dir->is_complete())
-      fetch_queue.emplace(std::piecewise_construct, std::make_tuple(dir), std::make_tuple());
+    fetch_queue.emplace(std::piecewise_construct, std::make_tuple(dir), std::make_tuple());
   }
 
   if (g_conf().get_val<bool>("mds_dir_prefetch")) {
     for (auto& in : rejoin_undef_inodes) {
       ceph_assert(!in->is_base());
       ceph_assert(in->get_parent_dir());
-      // No need to fetch if the dir is already complete
-      if (!in->get_parent_dir()->is_complete())
-        fetch_queue.emplace(std::piecewise_construct, std::make_tuple(in->get_parent_dir()), std::make_tuple());
+      fetch_queue.emplace(std::piecewise_construct, std::make_tuple(in->get_parent_dir()), std::make_tuple());
     }
   } else {
     for (auto& in : rejoin_undef_inodes) {