]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd/PrimaryLogPG.cc: limit trimming at can_rollback_to"
authorNeha Ojha <nojha@redhat.com>
Fri, 2 Nov 2018 23:46:22 +0000 (19:46 -0400)
committerNeha Ojha <nojha@redhat.com>
Fri, 2 Nov 2018 23:46:22 +0000 (19:46 -0400)
This reverts commit 0e57c101c9dd51ee3a84123c96e626799ab6d21e.

Signed-off-by: Neha Ojha <nojha@redhat.com>
src/osd/PrimaryLogPG.cc

index 5418493285968c2f1850e21c08653ab662d05baa..ad92b38c4ff65e59e64fcbeb1cb9709382e69625 100644 (file)
@@ -1575,10 +1575,8 @@ void PrimaryLogPG::calc_trim_to()
                 PG_STATE_BACKFILL_TOOFULL)) {
     target = cct->_conf->osd_max_pg_log_entries;
   }
-  // limit pg log trimming up to the can_rollback_to value
-  eversion_t limit = std::min(
-    pg_log.get_head(),
-    pg_log.get_can_rollback_to());
+  // limit pg log trimming up to the head of the log
+  eversion_t limit = pg_log.get_head();
   dout(10) << __func__ << " limit = " << limit << dendl;
 
   if (limit != eversion_t() &&