From 4c235d5a07b6719ef5fe313d77f18eba3f1d77e9 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 2 Nov 2018 19:50:38 -0400 Subject: [PATCH] Revert "osd: handle trim() during backfill" This reverts commit bdfc2a3b4fa8038ade31ccab5f5479508e9afff3. Signed-off-by: Neha Ojha --- src/osd/PG.cc | 7 +------ src/osd/PGLog.cc | 8 +++----- src/osd/PGLog.h | 3 +-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 7dfa1a95adb..9ad07664957 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 8148f57a152..80e15930849 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 6f85ee1f1a5..7253936ddcf 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, -- 2.47.3