From: Neha Ojha <nojha@redhat.com>
Date: Fri, 2 Nov 2018 23:46:22 +0000 (-0400)
Subject: Revert "osd/PrimaryLogPG.cc: limit trimming at can_rollback_to"
X-Git-Tag: v12.2.10~18^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99db3a7de4082953aaf3cfddc4b140e4ad174477;p=ceph.git

Revert "osd/PrimaryLogPG.cc: limit trimming at can_rollback_to"

This reverts commit 0e57c101c9dd51ee3a84123c96e626799ab6d21e.

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 541849328596..ad92b38c4ff6 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -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() &&