From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Mon, 24 Mar 2014 08:47:04 +0000 (+0800)
Subject: mds: don't clear scatter dirty when cache rejoin ack is received
X-Git-Tag: v0.79~52^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71fa779e08ec08768a558e812aeecd02aa26b4eb;p=ceph.git

mds: don't clear scatter dirty when cache rejoin ack is received

The auth mds has received dirty scatterlock state. But it hasn't
journaled the dirty state yet. The log segment that marked the
scatterlock dirty need to be preserved. Therefore, we can't clear
the dirty flag of scatterlock.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 4b48465d612b..d61ba48403ce 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -4819,8 +4819,6 @@ void MDCache::handle_cache_rejoin_ack(MMDSCacheRejoin *ack)
     assert(in);
     bufferlist::iterator q = basebl.begin();
     in->_decode_base(q);
-    // auth will send a full inode for any inode it got scatterlock state for.
-    in->clear_scatter_dirty();
     dout(10) << " got inode base " << *in << dendl;
   }