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>
(cherry picked from commit e1661fca6c02c1ed2414f3dea040b280832d36af)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index af7f4e663d6f79897fca438cfb77d12c0393eb03..7b65c476c66cda99358edd4ac6092837ff6a740f 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -6084,18 +6084,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) {