From patchwork Tue Oct 2 08:55:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1536391 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5998DDF238 for ; Tue, 2 Oct 2012 08:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754831Ab2JBIz5 (ORCPT ); Tue, 2 Oct 2012 04:55:57 -0400 Received: from mga14.intel.com ([143.182.124.37]:65146 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754674Ab2JBIz4 (ORCPT ); Tue, 2 Oct 2012 04:55:56 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 02 Oct 2012 01:55:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,522,1344236400"; d="scan'208";a="199527959" Received: from unknown (HELO zyan5-mobl.ccr.corp.intel.com) ([10.255.21.40]) by azsmga001.ch.intel.com with ESMTP; 02 Oct 2012 01:55:54 -0700 From: "Yan, Zheng" To: sage@inktank.com, ceph-devel@vger.kernel.org Cc: "Yan, Zheng" Subject: [PATCH 01/12] mds: Don't drop client request from MDS Date: Tue, 2 Oct 2012 16:55:41 +0800 Message-Id: <1349168152-13281-1-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.4 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: "Yan, Zheng" MDS may send client request for stray migration/reintegration. Signed-off-by: Yan, Zheng --- 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: