Merge PR #27256 into master

* refs/pull/27256/head:
	mds: drop reconnect message from non-existent session

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-04-08 16:13:00 -07:00
commit 40c06914de
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -1199,7 +1199,8 @@ void Server::handle_client_reconnect(const MClientReconnect::const_ref &m)
<< (m->has_more() ? " (more)" : "") << dendl;
client_t from = m->get_source().num();
Session *session = mds->get_session(m);
ceph_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;