mds: mark scatterlock stale on import of stale frag scatter stat

When the lock scattered, if we didn't have an auth frag that was frozen,
we go into MIX state.  Later, we may import a stale dirfrag.  We need to
move to MIX_STALE at that point, and/or mark the lock stale so that any
subsequent transition does so.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 064b0bde2ef038395ebd3ce954015f92d13344a3..654c49ce4b17897c7b8faf33df71ff757078cfbc 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1871,6 +1871,25 @@ void CDir::decode_import(bufferlist::iterator& blp, utime_t now)
     cache->mds->locker->mark_updated_scatterlock(&inode->nestlock);
   if (!(fnode.fragstat == fnode.accounted_fragstat))
     cache->mds->locker->mark_updated_scatterlock(&inode->filelock);
+
+  // stale fragstat?
+  inode_t *pi = inode->get_projected_inode();
+  if (fnode.fragstat.version != pi->dirstat.version) {
+    dout(10) << " got stale fragstat " << fnode.fragstat << " vs inode " << pi->dirstat << dendl;
+    if (inode->filelock.get_state() == LOCK_MIX)
+      inode->filelock.set_state(LOCK_MIX_STALE);
+    else if (inode->filelock.get_state() != LOCK_MIX_STALE)
+      inode->filelock.set_stale();
+  }
+
+  // stale rstat?
+  if (fnode.rstat.version != pi->rstat.version) {
+    dout(10) << " got stale rstat " << fnode.rstat << " vs inode " << pi->rstat << dendl;
+    if (inode->nestlock.get_state() == LOCK_MIX)
+      inode->nestlock.set_state(LOCK_MIX_STALE);
+    else if (inode->nestlock.get_state() != LOCK_MIX_STALE)
+      inode->nestlock.set_stale();
+  }
 }