update sources to v12.1.0

[ceph.git] / ceph / src / mds / MDLog.cc

diff --git a/ceph/src/mds/MDLog.cc b/ceph/src/mds/MDLog.cc
index f02489fd176cdd4d66097012d316642918de1b81..e8e5d3abe7a969e392953514c7366f143addb983 100644 (file)
--- a/ceph/src/mds/MDLog.cc
+++ b/ceph/src/mds/MDLog.cc
@@ -782,9 +782,11 @@ void MDLog::_trim_expired_segments()
     // this was the oldest segment, adjust expire pos
     if (journaler->get_expire_pos() < ls->end) {
       journaler->set_expire_pos(ls->end);
+      logger->set(l_mdl_expos, ls->end);
+    } else {
+      logger->set(l_mdl_expos, ls->offset);
     }
     
-    logger->set(l_mdl_expos, ls->offset);
     logger->inc(l_mdl_segtrm);
     logger->inc(l_mdl_evtrm, ls->num_events);
     
@@ -847,7 +849,7 @@ void MDLog::replay(MDSInternalContextBase *c)
   // empty?
   if (journaler->get_read_pos() == journaler->get_write_pos()) {
     dout(10) << "replay - journal empty, done." << dendl;
-    mds->mdcache->trim(-1);
+    mds->mdcache->trim();
     if (c) {
       c->complete(0);
     }