]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PeeringState::PeeringMachine::Deleting: rollfoward before resetting backfill
authorSamuel Just <sjust@redhat.com>
Thu, 11 Apr 2019 21:40:15 +0000 (14:40 -0700)
committersjust@redhat.com <sjust@redhat.com>
Wed, 1 May 2019 18:22:26 +0000 (11:22 -0700)
This looked wrong when I was moving it over.

Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/PeeringState.cc

index d0de0f8f01331c131a758228802e43c29855162c..73868cdd4fcf1870a45ce141536d70e2feaaf008 100644 (file)
@@ -5623,15 +5623,15 @@ PeeringState::Deleting::Deleting(my_context ctx)
   ps->deleting = true;
   ObjectStore::Transaction* t = context<PeeringMachine>().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);
 }