]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Make standby-replay mds not migrate empty subtree when trimming cache 17452/head
authorJianyu Li <joannyli@foxmail.com>
Mon, 4 Sep 2017 13:49:26 +0000 (21:49 +0800)
committerJianyu Li <joannyli@foxmail.com>
Mon, 4 Sep 2017 15:41:41 +0000 (23:41 +0800)
Signed-off-by: Jianyu Li <joannyli@tencent.com>
src/mds/MDCache.cc

index e6600dbd4ea77e4cd6b10d2fb93842c24299f505..0cf77a3f8c1b2d149c724027e5ed67733426e316 100644 (file)
@@ -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);