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)

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 1777a00c284035b63f38969aeef2434cbb9807bd..25413ee5bbec4677a6b5f7135d158230afbdade6 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -1493,6 +1493,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;
   }