From: Neha Ojha <nojha@redhat.com>
Date: Fri, 2 Nov 2018 23:47:37 +0000 (-0400)
Subject: Revert "osd/PGLog.cc: check if complete_to points to log.end()"
X-Git-Tag: v12.2.10~18^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d95b4f9d61c73075d55e3178a867f32fdff699f7;p=ceph.git

Revert "osd/PGLog.cc: check if complete_to points to log.end()"

This reverts commit ac772c90dfc3749527246242a3a84e5e48ff52e1.

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

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 8a6648c33eec5..8694af84887eb 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -51,8 +51,7 @@ void PGLog::IndexedLog::trim(
   eversion_t *write_from_dups)
 {
   assert(s <= can_rollback_to);
-  if (complete_to != log.end())
-    lgeneric_subdout(cct, osd, 20) << " complete_to " << complete_to->version << dendl;
+  lgeneric_subdout(cct, osd, 20) << " complete_to " << complete_to->version << dendl;
 
   auto earliest_dup_version =
     log.rbegin()->version.version < cct->_conf->osd_pg_log_dups_tracked
@@ -88,7 +87,7 @@ void PGLog::IndexedLog::trim(
 
     bool reset_complete_to = false;
     // we are trimming past complete_to, so reset complete_to
-    if (complete_to != log.end() && e.version >= complete_to->version)
+    if (e.version >= complete_to->version)
       reset_complete_to = true;
     if (rollback_info_trimmed_to_riter == log.rend() ||
 	e.version == rollback_info_trimmed_to_riter->version) {
@@ -183,8 +182,7 @@ void PGLog::trim(
     dout(10) << "trim " << log << " to " << trim_to << dendl;
     log.trim(cct, trim_to, &trimmed, &trimmed_dups, &write_from_dups);
     info.log_tail = log.tail;
-    if (log.complete_to != log.log.end())
-      dout(10) << " after trim complete_to " << log.complete_to->version << dendl;
+    dout(10) << " after trim complete_to " << log.complete_to->version << dendl;
   }
 }