From a0693c8ca4ea54950d44e9b5b2da0219d46ea5a6 Mon Sep 17 00:00:00 2001 From: Jianyu Li Date: Mon, 4 Sep 2017 21:49:26 +0800 Subject: [PATCH] Make standby-replay mds not migrate empty subtree when trimming cache Signed-off-by: Jianyu Li (cherry picked from commit 178ca58fec2d820f61724d223addac1c4fa67086) --- src/mds/MDCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index e6600dbd4ea7..0cf77a3f8c1b 100644 --- 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); -- 2.47.3