Make standby-replay mds not migrate empty subtree when trimming cache

Signed-off-by: Jianyu Li <joannyli@tencent.com>
(cherry picked from commit 178ca58fec2d820f61724d223addac1c4fa67086)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index e6600dbd4ea77e4cd6b10d2fb93842c24299f505..0cf77a3f8c1b2d149c724027e5ed67733426e316 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -6522,7 +6522,7 @@ bool MDCache::trim(int max, int count)
       if (!diri->is_auth() && !diri->is_base() &&
          dir->get_num_head_items() == 0) {
        if (dir->state_test(CDir::STATE_EXPORTING) ||
-           dir->is_freezing() || dir->is_frozen())
+           dir->is_freezing() || dir->is_frozen() || !mds->is_active())
          continue;
 
        migrator->export_empty_import(dir);