From: Neha Ojha <nojha@redhat.com>
Date: Tue, 17 Jul 2018 01:11:27 +0000 (-0700)
Subject: osd/PGLog: allow pg log trim when complete_to is less than trim_to
X-Git-Tag: v14.0.1~843^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a5329ba8dd169e55deaff47d042354e53d8e722d;p=ceph-ci.git

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

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

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 9a5fba5bd59..6437f7b4594 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -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