Revert "osd/PGLog: allow pg log trim when complete_to is less than trim_to"
authorNeha Ojha <nojha@redhat.com>
Fri, 2 Nov 2018 23:49:41 +0000 (19:49 -0400)
committerNeha Ojha <nojha@redhat.com>
Fri, 2 Nov 2018 23:49:41 +0000 (19:49 -0400)
This reverts commit be8b406d9162a1f46b3eac2fca07b0cf20697b90.

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

index 30152539f0a65771e96096ea4933b7262e249249..b384a2cdd6567b3deb928fce704276d7159dbf0f 100644 (file)
@@ -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