From 613769918b5f86c28e7ebd232851d6d4962e8910 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 2 Nov 2018 19:50:22 -0400 Subject: [PATCH] Revert "osd: allow trim() to proceed when there are missing items" This reverts commit d08f0aec86ecd9b23310f1c41f9cb9060f10bc6b. Signed-off-by: Neha Ojha --- src/osd/PGLog.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index b3fc17a897022..8148f57a152c5 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -168,10 +168,8 @@ void PGLog::trim( dout(10) << __func__ << " proposed trim_to = " << trim_to << dendl; // trim? if (trim_to > log.tail) { - dout(10) << __func__ << " missing = " << missing.num_missing() << dendl; // Don't assert for backfill_targets - // or whenever there are missing items - if (transaction_applied && (missing.num_missing() == 0)) + if (transaction_applied) assert(trim_to <= info.last_complete); dout(10) << "trim " << log << " to " << trim_to << dendl; -- 2.39.5