From: Neha Ojha <nojha@redhat.com>
Date: Fri, 2 Nov 2018 23:49:41 +0000 (-0400)
Subject: Revert "osd/PGLog: allow pg log trim when complete_to is less than trim_to"
X-Git-Tag: v12.2.10~18^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b88ec0e553e26e6eead8c3a3914f04b21573fd2;p=ceph.git

Revert "osd/PGLog: allow pg log trim when complete_to is less than trim_to"

This reverts commit be8b406d9162a1f46b3eac2fca07b0cf20697b90.

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

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 30152539f0a6..b384a2cdd656 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -50,8 +50,15 @@ void PGLog::IndexedLog::trim(
   set<string>* trimmed_dups,
   eversion_t *write_from_dups)
 {
+  if (complete_to != log.end() &&
+      complete_to->version <= s) {
+    generic_dout(0) << " bad trim to " << s << " when complete_to is "
+		    << complete_to->version
+		    << " on " << *this << dendl;
+  }
+
   assert(s <= can_rollback_to);
-  generic_dout(20) << " complete_to " << complete_to->version << dendl;
+  generic_dout(0) << " complete_to " << complete_to->version << dendl;
 
   auto earliest_dup_version =
     log.rbegin()->version.version < cct->_conf->osd_pg_log_dups_tracked