]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/PGLog: allow pg log trim when complete_to is less than trim_to
authorNeha Ojha <nojha@redhat.com>
Tue, 17 Jul 2018 01:11:27 +0000 (18:11 -0700)
committerNeha Ojha <nojha@redhat.com>
Tue, 17 Jul 2018 21:06:19 +0000 (14:06 -0700)
Signed-off-by: Neha Ojha <nojha@redhat.com>
src/osd/PGLog.cc

index 9a5fba5bd59787a19bed0bfb8ec41f6587934c68..6437f7b459406b6abad46119c19791bf7b11f5ab 100644 (file)
@@ -50,16 +50,8 @@ void PGLog::IndexedLog::trim(
   set<string>* trimmed_dups,
   eversion_t *write_from_dups)
 {
-  if (complete_to != log.end() &&
-      complete_to->version <= s) {
-    generic_derr << " bad trim to " << s << " when complete_to is "
-                << complete_to->version
-                << " on " << *this << dendl;
-    assert(0 == "out of order trim");
-  }
-
   assert(s <= can_rollback_to);
-  generic_dout(0) << " complete_to " << complete_to->version << dendl;
+  generic_dout(20) << " complete_to " << complete_to->version << dendl;
 
   auto earliest_dup_version =
     log.rbegin()->version.version < cct->_conf->osd_pg_log_dups_tracked