From ee11b6cd9ce97820c4f53ed98380bbd63fab891f Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 20 Dec 2017 09:56:50 +0800 Subject: [PATCH] mds: respect mds_client_writeable_range_max_inc_objs config get_layout_size_increment() return layout.get_period(). A period contain layout.stripe_count objects. The config is for limiting number of objects need to probe when recovering a file. Fixes: http://tracker.ceph.com/issues/22492 Signed-off-by: "Yan, Zheng" --- src/mds/Locker.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 1a82d0e8d6f..1fe45bcef07 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2298,7 +2298,7 @@ uint64_t Locker::calc_new_max_size(inode_t *pi, uint64_t size) uint64_t new_max = (size + 1) << 1; uint64_t max_inc = g_conf->mds_client_writeable_range_max_inc_objs; if (max_inc > 0) { - max_inc *= pi->get_layout_size_increment(); + max_inc *= pi->layout.object_size; new_max = std::min(new_max, size + max_inc); } return ROUND_UP_TO(new_max, pi->get_layout_size_increment()); -- 2.47.3