mds: Call trim_non_auth_subtree when appropriate.

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 8e997b1bc8fbcf578c00f4b1a5d252ce01526a58..560ce013ac5f606e1cfdf192878ffe2826d80252 100644 (file)
--- 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 7528e68bb724f08915a66bdcdcc8c4e3a524b306..86c73f3560155bfdc9920491639f7cadae3b1087 100644 (file)
--- 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);
 }