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>

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 396db80873b3d92e2572c8ce4fe94eb9db2abd2e..82899d2da5654ba3695e320c81e58c484b3bfe71 100644 (file)
--- 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;
   }