]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: drop reconnect message from non-existent session 27916/head
authorshenhang <shenhang@kuaishou.com>
Fri, 29 Mar 2019 03:54:59 +0000 (11:54 +0800)
committerPrashant D <pdhange@redhat.com>
Wed, 1 May 2019 23:35:55 +0000 (19:35 -0400)
fixes:http://tracker.ceph.com/issues/39026

Signed-off-by: Shen Hang <harryshen18@gmail.com>
(cherry picked from commit 017cd2a663e71039c54c57d70fec722c0c4aba81)

Conflicts:
src/mds/Server.cc : Resolved in handle_client_reconnect

src/mds/Server.cc

index dcb0be286da117bbe6974a15a12938c6515f0d34..db590eca2b653c63649741fa0d0ab0bfd28c5df4 100644 (file)
@@ -1020,7 +1020,8 @@ void Server::handle_client_reconnect(MClientReconnect *m)
   dout(7) << "handle_client_reconnect " << m->get_source() << dendl;
   client_t from = m->get_source().num();
   Session *session = mds->get_session(m);
-  assert(session);
+  if (!session)
+    return;
 
   if (!mds->is_reconnect() && mds->get_want_state() == CEPH_MDS_STATE_RECONNECT) {
     dout(10) << " we're almost in reconnect state (mdsmap delivery race?); waiting" << dendl;