From: Neha Ojha <nojha@redhat.com>
Date: Fri, 2 Nov 2018 23:50:38 +0000 (-0400)
Subject: Revert "osd: handle trim() during backfill"
X-Git-Tag: v12.2.10~18^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c235d5a07b6719ef5fe313d77f18eba3f1d77e9;p=ceph.git

Revert "osd: handle trim() during backfill"

This reverts commit bdfc2a3b4fa8038ade31ccab5f5479508e9afff3.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7dfa1a95adba..9ad076649575 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3460,12 +3460,7 @@ void PG::append_log(
 
   dout(10) << __func__ << " approx pg log length =  "
            << pg_log.get_log().approx_size() << dendl;
-  dout(10) << __func__ << " transaction_applied = "
-           << transaction_applied << dendl;
-  if (!transaction_applied)
-    dout(10) << __func__ << " " << pg_whoami
-             << " is backfill target" << dendl;
-  pg_log.trim(trim_to, info, transaction_applied);
+  pg_log.trim(trim_to, info);
 
   // update the local pg, pg log
   dirty_info = true;
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 8148f57a152c..80e159308499 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -162,15 +162,13 @@ void PGLog::clear_info_log(
 
 void PGLog::trim(
   eversion_t trim_to,
-  pg_info_t &info,
-  bool transaction_applied)
+  pg_info_t &info)
 {
   dout(10) << __func__ << " proposed trim_to = " << trim_to << dendl;
   // trim?
   if (trim_to > log.tail) {
-    // Don't assert for backfill_targets
-    if (transaction_applied)
-      assert(trim_to <= info.last_complete);
+    // We shouldn't be trimming the log past last_complete
+    assert(trim_to <= info.last_complete);
 
     dout(10) << "trim " << log << " to " << trim_to << dendl;
     log.trim(cct, trim_to, &trimmed, &trimmed_dups, &write_from_dups);
diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 6f85ee1f1a55..7253936ddcfa 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -705,8 +705,7 @@ public:
 
   void trim(
     eversion_t trim_to,
-    pg_info_t &info,
-    bool transaction_applied = true);
+    pg_info_t &info);
 
   void roll_forward_to(
     eversion_t roll_forward_to,