mds: defer caps msgs until clientreplay or active

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 8bf2c344884ab7a2a8ee92f7593ac452f413e64e..6b15c73e9d6cc7a3da2a3100684df20a9f8a3351 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1611,6 +1611,11 @@ void Locker::handle_client_caps(MClientCaps *m)
          << " follows " << follows 
          << " op " << ceph_cap_op_name(m->get_op()) << dendl;
 
+  if (!mds->is_active() && !mds->is_stopping() && !mds->is_clientreplay()) {
+    mds->wait_for_replay(new C_MDS_RetryMessage(mds, m));
+    return;
+  }
+
   CInode *head_in = mdcache->get_inode(m->get_ino());
   if (!head_in) {
     dout(7) << "handle_client_caps on unknown ino " << m->get_ino() << ", dropping" << dendl;

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 3740737728c5764de82b1e9a97fe90a7882510ab..d8063fe65a96083b5b811eb37a4238afbbbdfc99 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1010,7 +1010,7 @@ void MDS::rejoin_done()
   mdcache->show_subtrees();
   mdcache->show_cache();
 
-  if (waiting_for_replay.empty())
+  if (replay_queue.empty())
     request_state(MDSMap::STATE_ACTIVE);
   else
     request_state(MDSMap::STATE_CLIENTREPLAY);
@@ -1019,6 +1019,7 @@ void MDS::rejoin_done()
 void MDS::clientreplay_start()
 {
   dout(1) << "clientreplay_start" << dendl;
+  finish_contexts(waiting_for_replay);  // kick waiters
   queue_one_replay();
 }
 
@@ -1032,6 +1033,7 @@ void MDS::active_start()
 {
   dout(1) << "active_start" << dendl;
   mdcache->clean_open_file_lists();
+  finish_contexts(waiting_for_replay);  // kick waiters
   finish_contexts(waiting_for_active);  // kick waiters
 }
 
@@ -1312,7 +1314,7 @@ bool MDS::_dispatch(Message *m)
     // done with all client replayed requests?
     if (is_clientreplay() &&
        mdcache->is_open() &&
-       waiting_for_replay.empty() &&
+       replay_queue.empty() &&
        want_state == MDSMap::STATE_CLIENTREPLAY) {
       dout(10) << " still have " << mdcache->get_num_active_requests()
               << " active replay requests" << dendl;

diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index cce015d41c93f4944f23d8e9dfe858aab2147cf7..7ab30c40e287de38d4f4cd8bc9beede3096e0614 100644 (file)
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -184,6 +184,7 @@ class MDS : public Dispatcher {
   int want_state;    // the state i want
 
   list<Context*> waiting_for_active, waiting_for_replay;
+  list<Context*> replay_queue;
   map<int, list<Context*> > waiting_for_active_peer;
   list<Context*> waiting_for_nolaggy;
 
@@ -201,6 +202,9 @@ class MDS : public Dispatcher {
   void wait_for_replay(Context *c) { 
     waiting_for_replay.push_back(c); 
   }
+  void enqueue_replay(Context *c) {
+    replay_queue.push_back(c);
+  }
 
   int get_state() { return state; } 
   bool is_creating() { return state == MDSMap::STATE_CREATING; }
@@ -233,10 +237,10 @@ class MDS : public Dispatcher {
     finished_queue.splice( finished_queue.end(), ls );
   }
   bool queue_one_replay() {
-    if (waiting_for_replay.empty())
+    if (replay_queue.empty())
       return false;
-    queue_waiter(waiting_for_replay.front());
-    waiting_for_replay.pop_front();
+    queue_waiter(replay_queue.front());
+    replay_queue.pop_front();
     return true;
   }
   

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 349b45973b98d55f195457176461c74450dfa802..b3da592f983588c189c36038164964530706c692 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -105,7 +105,7 @@ void Server::dispatch(Message *m)
        m->get_type() == CEPH_MSG_CLIENT_REQUEST &&
        ((MClientRequest*)m)->is_replay()) {
       dout(3) << "queuing replayed op" << dendl;
-      mds->wait_for_replay(new C_MDS_RetryMessage(mds, m));
+      mds->enqueue_replay(new C_MDS_RetryMessage(mds, m));
       return;
     } else if (mds->is_clientreplay() &&
               m->get_type() == CEPH_MSG_CLIENT_REQUEST &&