From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 29 Oct 2010 18:03:08 +0000 (-0700)
Subject: mds: Call trim_non_auth_subtree when appropriate.
X-Git-Tag: v0.23~75^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=404c83e3e53a66e1f83133d1e97d581ddd3859cc;p=ceph.git

mds: Call trim_non_auth_subtree when appropriate.
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 8e997b1bc8fb..560ce013ac5f 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1858,6 +1858,8 @@ void Migrator::import_reverse(CDir *dir)
 
   // update auth, with possible subtree merge.
   assert(dir->is_subtree_root());
+  if (mds->is_resolve())
+    cache->trim_non_auth_subtree(dir);
   cache->adjust_subtree_auth(dir, import_peer[dir->dirfrag()]);
   cache->try_subtree_merge(dir);
 
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 7528e68bb724..86c73f356015 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1025,6 +1025,7 @@ void EExport::replay(MDS *mds)
   }
 
   // adjust auth away
+  mds->mdcache->trim_non_auth_subtree(dir);
   mds->mdcache->adjust_bounded_subtree_auth(dir, realbounds, pair<int,int>(CDIR_AUTH_UNKNOWN, CDIR_AUTH_UNKNOWN));
   mds->mdcache->try_subtree_merge(dir);
 }