From: "Yan, Zheng" <[email protected]> MDS may send client request for stray migration/reintegration.
Signed-off-by: Yan, Zheng <[email protected]> --- src/mds/MDCache.cc | 3 ++- src/mds/MDS.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 06933f9..efa6671 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -7473,7 +7473,8 @@ void MDCache::request_forward(MDRequest *mdr, int who, int port) void MDCache::dispatch_request(MDRequest *mdr) { if (mdr->client_request) { - if (!mdr->item_session_request.is_on_list()) { + if (!mdr->reqid.name.is_mds() && + !mdr->item_session_request.is_on_list()) { dout(10) << "request " << *mdr << " is canceled" << dendl; return; } diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index 8a5355b..3e7c97c 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -1716,9 +1716,9 @@ bool MDS::handle_deferrable_message(Message *m) switch (m->get_type()) { // SERVER case CEPH_MSG_CLIENT_SESSION: - case CEPH_MSG_CLIENT_REQUEST: case CEPH_MSG_CLIENT_RECONNECT: ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_CLIENT); + case CEPH_MSG_CLIENT_REQUEST: server->dispatch(m); break; case MSG_MDS_SLAVE_REQUEST: -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
