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 1/4] mds: fix stray migration/reintegration check in handle_client_rename
Date: Thu, 25 Oct 2012 20:26:49 +0800	[thread overview]
Message-ID: <1351168012-4981-1-git-send-email-zheng.z.yan@intel.com> (raw)

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

The stray migration/reintegration generates a source path that will
be rooted in a (possibly remote) MDS's MDSDIR; adjust the check in
handle_client_rename()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
 src/leveldb       | 2 +-
 src/mds/Server.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/leveldb b/src/leveldb
index c79c270..f2d406b 160000
--- a/src/leveldb
+++ b/src/leveldb
@@ -1 +1 @@
-Subproject commit c79c270174307411819ddfdd8c9b671ec4fb69c9
+Subproject commit f2d406b4213a22bfed3acfdb071fbec9ca9205cc
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 8f36b02..0a141d4 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -5135,7 +5135,7 @@ void Server::handle_client_rename(MDRequest *mdr)
 
   // is this a stray migration, reintegration or merge? (sanity checks!)
   if (mdr->reqid.name.is_mds() &&
-      !(MDS_INO_IS_STRAY(srcpath.get_ino()) &&
+      !(MDS_INO_IS_MDSDIR(srcpath.get_ino()) &&
 	MDS_INO_IS_STRAY(destpath.get_ino())) &&
       !(destdnl->is_remote() &&
 	destdnl->get_remote_ino() == srci->ino())) {
-- 
1.7.11.7


             reply	other threads:[~2012-10-25 12:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-25 12:26 Yan, Zheng [this message]
2012-10-25 12:26 ` [PATCH 2/4] mds: Fix stray check in Migrator::export_dir() Yan, Zheng
2012-10-25 12:26 ` [PATCH 3/4] mds: Send mdsdir as base inode for rejoins Yan, Zheng
2012-10-25 12:26 ` [PATCH 4/4] mds: Allow evaluating locks in replica object Yan, Zheng
2012-10-26 22:49   ` Sage Weil

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=1351168012-4981-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.