From a80f93006958ba3f23dd2f0b712cfb6f9093fa05 Mon Sep 17 00:00:00 2001
From: Venky Shankar <vshankar@redhat.com>
Date: Wed, 2 Aug 2023 12:44:02 +0530
Subject: [PATCH] mds: adjust pre_segments_size for MDLog when trimming
 segments for standby-replay

Otherwise, trimming mdlog during shutdown can result in the number of
segments lagging pre_segments_size (the number of segments processed
during replay).

Fixes: http://tracker.ceph.com/issues/59833
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit bd784ee0c81ba535a28a2ef1d0db747484bcd9c7)
---
 src/mds/MDLog.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 396db80873b..82899d2da56 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -1494,6 +1494,9 @@ void MDLog::standby_trim_segments()
     dout(10) << " removing segment" << dendl;
     mds->mdcache->standby_trim_segment(seg);
     remove_oldest_segment();
+    if (pre_segments_size > 0) {
+      --pre_segments_size;
+    }
     removed_segment = true;
   }
 
-- 
2.39.5