From 3c3bc24ca3e58f1b3c225aa275cdd9c320a6dccc Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Mon, 31 Jul 2023 01:59:24 -0400 Subject: [PATCH] mds: remove a bunch of heuristics from MDLog::trim() These were probbaly introduced to workaround some sort of resource overusage by the MDS during trimming, but now it looks like they are not really neeeded, especially if we introduce a dedicated thread for log trimming. Signed-off-by: Venky Shankar --- src/mds/MDLog.cc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index c174428a1f9..2ade813c22f 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -645,11 +645,8 @@ void MDLog::trim(int m) unsigned new_expiring_segments = 0; - unsigned max_expiring_segments = 0; - if (pre_segments_size > 0){ - max_expiring_segments = max_segments/2; + if (pre_segments_size > 0) { ceph_assert(segments.size() >= pre_segments_size); - max_expiring_segments = std::max(max_expiring_segments,segments.size() - pre_segments_size); } map::iterator p = segments.begin(); @@ -685,15 +682,6 @@ void MDLog::trim(int m) break; } - // Do not trim too many segments at once for peak workload. If mds keeps creating N segments each tick, - // the upper bound of 'num_remaining_segments - max_segments' is '2 * N' - if (new_expiring_segments * 2 > num_remaining_segments) - break; - - if (max_expiring_segments > 0 && - expiring_segments.size() >= max_expiring_segments) - break; - // look at first segment LogSegment *ls = p->second; ceph_assert(ls); -- 2.39.5