From ce143b66ce8f02459fad6c423ca57754c8127b67 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 11 Apr 2019 14:40:15 -0700 Subject: [PATCH] PeeringState::PeeringMachine::Deleting: rollfoward before resetting backfill This looked wrong when I was moving it over. Signed-off-by: Samuel Just --- src/osd/PeeringState.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc index d0de0f8f013..73868cdd4fc 100644 --- a/src/osd/PeeringState.cc +++ b/src/osd/PeeringState.cc @@ -5623,15 +5623,15 @@ PeeringState::Deleting::Deleting(my_context ctx) ps->deleting = true; ObjectStore::Transaction* t = context().get_cur_transaction(); + // clear log + PGLog::LogEntryHandlerRef rollbacker{pl->get_log_handler(t)}; + ps->pg_log.roll_forward(rollbacker.get()); + // adjust info to backfill ps->info.set_last_backfill(hobject_t()); ps->pg_log.reset_backfill(); ps->dirty_info = true; - // clear log - PGLog::LogEntryHandlerRef rollbacker{pl->get_log_handler(t)}; - ps->pg_log.roll_forward(rollbacker.get()); - pl->on_removal(t); } -- 2.39.5