Revert "mds: finish table servers recovery after creating newfs"

This reverts commit f6c20730c16a7632061639dd83be523fc6a9a44f.

This breaks single MDS startup.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index b4cce0824c6aab98797a0cc15b8a7a780a512293..2473ff0eb1fdacb71266aa8fddd577e3bac70ad6 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -994,10 +994,9 @@ void MDS::handle_mds_map(MMDSMap *m)
     } else {
       // did i just recover?
       if ((is_active() || is_clientreplay()) &&
-          (oldstate == MDSMap::STATE_CREATING ||
-          oldstate == MDSMap::STATE_REJOIN ||
+          (oldstate == MDSMap::STATE_REJOIN ||
           oldstate == MDSMap::STATE_RECONNECT))
-        recovery_done(oldstate);
+        recovery_done();
 
       if (is_active()) {
         active_start();
@@ -1565,7 +1564,7 @@ void MDS::active_start()
   finish_contexts(g_ceph_context, waiting_for_active);  // kick waiters
 }
 
-void MDS::recovery_done(int oldstate)
+void MDS::recovery_done()
 {
   dout(1) << "recovery_done -- successful recovery!" << dendl;
   assert(is_clientreplay() || is_active());
@@ -1580,9 +1579,6 @@ void MDS::recovery_done(int oldstate)
     snapserver->finish_recovery(active);
   }
 
-  if (oldstate == MDSMap::STATE_CREATING)
-    return;
-
   mdcache->start_recovered_truncates();
   mdcache->do_file_recover();
 

diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 1cd6096b46d13af367328ec65f0d4900bc4905b6..a1e1c58c83f996ef3c2e1ff87757b7b9dc880a9b 100644 (file)
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -389,7 +389,7 @@ class MDS : public Dispatcher {
   void rejoin_joint_start();
   void rejoin_start();
   void rejoin_done();
-  void recovery_done(int oldstate);
+  void recovery_done();
   void clientreplay_start();
   void clientreplay_done();
   void active_start();