mds: don't discover inode/dirfrag when mds is in 'starting' state

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23812

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 6803eeadee2ff23714bf4ac173f0880091f8cb2a..0b3bd7477fbbf6c3804b125f59a77c0f9f09ce85 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -613,6 +613,24 @@ void MDCache::open_mydir_inode(MDSInternalContextBase *c)
   in->fetch(c);
 }
 
+void MDCache::open_mydir_frag(MDSInternalContextBase *c)
+{
+  open_mydir_inode(
+      new MDSInternalContextWrapper(mds,
+       new FunctionContext([this, c](int r) {
+           if (r < 0) {
+             c->complete(r);
+             return;
+           }
+           CDir *mydir = myin->get_or_open_dirfrag(this, frag_t());
+           assert(mydir);
+           adjust_subtree_auth(mydir, mds->get_nodeid());
+           mydir->fetch(c);
+         })
+       )
+      );
+}
+
 void MDCache::open_root()
 {
   dout(10) << "open_root" << dendl;

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index d8c9cd401de9f41347960b6a37f2eec181ad00ab..ec5e6e6dde8841ac3cd8d4a6d9cb83264b1c0b59 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -915,6 +915,7 @@ public:
   void open_root_inode(MDSInternalContextBase *c);
   void open_root();
   void open_mydir_inode(MDSInternalContextBase *c);
+  void open_mydir_frag(MDSInternalContextBase *c);
   void populate_mydir();
 
   void _create_system_file(CDir *dir, const char *name, CInode *in, MDSInternalContextBase *fin);

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 8d8faf199d0eb2fc18e8bead65d9ac30694bbed3..3d259afcc6fc5dbe3b0a09c1dd9af235fcb3deac 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1090,17 +1090,21 @@ void MDSRank::boot_start(BootStep step, int r)
         MDSGatherBuilder gather(g_ceph_context,
             new C_MDS_BootStart(this, MDS_BOOT_PREPARE_LOG));
 
-       mdcache->open_mydir_inode(gather.new_sub());
+       if (is_starting()) {
+         // load mydir frag for the first log segment (creating subtree map)
+         mdcache->open_mydir_frag(gather.new_sub());
+       } else {
+         mdcache->open_mydir_inode(gather.new_sub());
+       }
 
        mdcache->create_global_snaprealm();
 
-        if (is_starting() ||
-            whoami == mdsmap->get_root()) {  // load root inode off disk if we are auth
-          mdcache->open_root_inode(gather.new_sub());
-        } else {
-          // replay.  make up fake root inode to start with
-          (void)mdcache->create_root_inode();
-        }
+       if (whoami == mdsmap->get_root()) {  // load root inode off disk if we are auth
+         mdcache->open_root_inode(gather.new_sub());
+       } else if (is_any_replay()) {
+         // replay.  make up fake root inode to start with
+         mdcache->create_root_inode();
+       }
         gather.activate();
       }
       break;
@@ -1166,16 +1170,7 @@ void MDSRank::starting_done()
   assert(is_starting());
   request_state(MDSMap::STATE_ACTIVE);
 
-  mdcache->open_root();
-
-  if (mdcache->is_open()) {
-    mdlog->start_new_segment();
-  } else {
-    mdcache->wait_for_open(new MDSInternalContextWrapper(this,
-                          new FunctionContext([this] (int r) {
-                              mdlog->start_new_segment();
-                          })));
-  }
+  mdlog->start_new_segment();
 
   // sync snaptable cache
   snapclient->sync(new C_MDSInternalNoop);
@@ -1476,7 +1471,8 @@ void MDSRank::active_start()
 {
   dout(1) << "active_start" << dendl;
 
-  if (last_state == MDSMap::STATE_CREATING) {
+  if (last_state == MDSMap::STATE_CREATING ||
+      last_state == MDSMap::STATE_STARTING) {
     mdcache->open_root();
   }
 
@@ -1744,7 +1740,7 @@ void MDSRankDispatcher::handle_mds_map(
 
   // REJOIN
   // is everybody finally rejoining?
-  if (is_starting() || is_rejoin() || is_clientreplay() || is_active() || is_stopping()) {
+  if (is_rejoin() || is_clientreplay() || is_active() || is_stopping()) {
     // did we start?
     if (!oldmap->is_rejoining() && mdsmap->is_rejoining())
       rejoin_joint_start();