All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yan, Zheng" <zheng.z.yan@intel.com>
To: sage@inktank.com, ceph-devel@vger.kernel.org
Cc: "Yan, Zheng" <zheng.z.yan@intel.com>
Subject: [PATCH 01/12] mds: Don't drop client request from MDS
Date: Tue,  2 Oct 2012 16:55:41 +0800	[thread overview]
Message-ID: <1349168152-13281-1-git-send-email-zheng.z.yan@intel.com> (raw)

From: "Yan, Zheng" <zheng.z.yan@intel.com>

MDS may send client request for stray migration/reintegration.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
 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


             reply	other threads:[~2012-10-02  8:55 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-02  8:55 Yan, Zheng [this message]
2012-10-02  8:55 ` [PATCH 02/12] mds: Consider stopping MDS when finding peer inode Yan, Zheng
2012-10-02  8:55 ` [PATCH 03/12] mds: Add finish callback to waiting_for_base_ino wait queue Yan, Zheng
2012-10-02  8:55 ` [PATCH 04/12] mds: Allow rename request for stray migration/reintegration Yan, Zheng
2012-10-02  8:55 ` [PATCH 05/12] mds: Fix xlock imports Yan, Zheng
2012-10-02  8:55 ` [PATCH 06/12] mds: Set metablob.renamed_dirino in do_rename_rollback() Yan, Zheng
2012-10-02  8:55 ` [PATCH 07/12] mds: Avoid save unnecessary parent snaprealm Yan, Zheng
2012-10-02  8:55 ` [PATCH 08/12] mds: Allow export subtrees in other MDS' stray directory Yan, Zheng
2012-10-02  8:55 ` [PATCH 09/12] mds: Properly update dirty dir fragstat during log replay Yan, Zheng
2012-10-02  8:55 ` [PATCH 10/12] mds: Trim non auth subtree directory Yan, Zheng
2012-10-02  8:55 ` [PATCH 11/12] mds: Properly re-calculate mdsdir inode's auth bit Yan, Zheng
2012-10-02  8:55 ` [PATCH 12/12] mds: Avoid creating unnecessary snaprealm Yan, Zheng
2012-10-02 18:31   ` Sage Weil
2012-10-02 23:45     ` Yan, Zheng
2012-10-03  0:12       ` Sage Weil
2012-10-03 11:44         ` Yan, Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349168152-13281-1-git-send-email-zheng.z.yan@intel.com \
    --to=zheng.z.yan@intel.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=sage@inktank.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.