From: Neha Ojha <nojha@redhat.com>
Date: Fri, 2 Nov 2018 23:50:03 +0000 (-0400)
Subject: Revert "osd: reset complete_to when trimming the log past it"
X-Git-Tag: v12.2.10~18^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6396dca4d12d0b3c51e6382def1f5dfc886f472e;p=ceph.git

Revert "osd: reset complete_to when trimming the log past it"

This reverts commit 715d1fdbfc407de81686784d99fe28b51c6d97ef.

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

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index b384a2cdd65..b3fc17a8970 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -58,7 +58,6 @@ void PGLog::IndexedLog::trim(
   }
 
   assert(s <= can_rollback_to);
-  generic_dout(0) << " complete_to " << complete_to->version << dendl;
 
   auto earliest_dup_version =
     log.rbegin()->version.version < cct->_conf->osd_pg_log_dups_tracked
@@ -92,10 +91,6 @@ void PGLog::IndexedLog::trim(
       }
     }
 
-    bool reset_complete_to = false;
-    // we are trimming past complete_to, so reset complete_to
-    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) {
       log.pop_front();
@@ -103,13 +98,6 @@ void PGLog::IndexedLog::trim(
     } else {
       log.pop_front();
     }
-
-    // reset complete_to to the beginning of the log
-    if (reset_complete_to) {
-      generic_dout(0) << " moving complete_to " << " to "
-                      << log.begin()->version << dendl;
-      complete_to = log.begin();
-    }
   }
 
   while (!dups.empty()) {
@@ -189,7 +177,6 @@ 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;
-    dout(10) << " after trim complete_to " << log.complete_to->version << dendl;
   }
 }
 
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index ad92b38c4ff..f1143979fcf 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -10684,8 +10684,6 @@ void PrimaryLogPG::_applied_recovered_object_replica()
 void PrimaryLogPG::recover_got(hobject_t oid, eversion_t v)
 {
   dout(10) << "got missing " << oid << " v " << v << dendl;
-  dout(10) << __func__ << " complete_to "
-           << pg_log.get_log().complete_to->version << dendl;
   pg_log.recover_got(oid, v, info);
   if (pg_log.get_log().complete_to != pg_log.get_log().log.end()) {
     dout(10) << "last_complete now " << info.last_complete