From 828c3af92e31c360d12343f47b6b0317964c19c1 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 15 Dec 2021 10:00:29 -0500 Subject: [PATCH] mds: skip directory size checks for reintegration Directory size will not change. Fixes: https://tracker.ceph.com/issues/53619 Signed-off-by: Patrick Donnelly (cherry picked from commit cdc7e67abcdedf33523e876431ad1abb2492a74d) Conflicts: src/mds/Server.cc: depends on #44512 --- src/mds/Server.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 618f1160de569..0e4e821177258 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -8189,7 +8189,10 @@ void Server::handle_client_rename(MDRequestRef& mdr) if (!check_access(mdr, destdn->get_dir()->get_inode(), MAY_WRITE)) return; - if (!check_fragment_space(mdr, destdn->get_dir())) + if (!linkmerge && !check_fragment_space(mdr, destdn->get_dir())) + return; + + if (!linkmerge && !check_dir_max_entries(mdr, destdn->get_dir())) return; if (!check_access(mdr, srci, MAY_WRITE)) -- 2.39.5