mds: client session force-open fixes

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 0670d6b8eec90672d896a86cc9a6c8353cfcab7c..0f30446eac8b79e657b771bbea7bfd22579d0002 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -924,7 +924,6 @@ void Client::handle_client_session(MClientSession *m)
 
   switch (m->op) {
   case CEPH_SESSION_OPEN:
-    assert(mds_sessions.count(from) == 0);
     mds_sessions[from].seq = 0;
     break;
 

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index bdeb3fc32d8237e5a46490ce5ede2232ddd8244f..3799c57685734ec560eb588d768303f260acd566 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -247,6 +247,7 @@ version_t Server::prepare_force_open_sessions(map<__u32,entity_inst_t>& cm)
     Session *session = mds->sessionmap.get_or_add_session(p->second);
     if (session->is_undef() || session->is_closing())
       mds->sessionmap.set_state(session, Session::STATE_OPENING);
+    mds->sessionmap.touch_session(session);
   }
   return pv;
 }