import 15.2.2 octopus source

[ceph.git] / ceph / src / osd / PeeringState.cc

diff --git a/ceph/src/osd/PeeringState.cc b/ceph/src/osd/PeeringState.cc
index 10ffec25291013069699401b9355b261f93ea96f..5a49aaf4514e94c02f786dfd7949740f7f577bfa 100644 (file)
--- a/ceph/src/osd/PeeringState.cc
+++ b/ceph/src/osd/PeeringState.cc
@@ -4093,9 +4093,10 @@ void PeeringState::calc_trim_to_aggressive()
   size_t target = pl->get_target_pg_log_entries();
 
   // limit pg log trimming up to the can_rollback_to value
-  eversion_t limit = std::min(
+  eversion_t limit = std::min({
     pg_log.get_head(),
-    pg_log.get_can_rollback_to());
+    pg_log.get_can_rollback_to(),
+    last_update_ondisk});
   psdout(10) << __func__ << " limit = " << limit << dendl;
 
   if (limit != eversion_t() &&