osd/PeeringState: set PG_STATE_BACKFILLING before calling

on_backfill_reserved

Signed-off-by: Xuehan Xu <[email protected]>

Author: xxhdx1985126

src/crimson/osd/pg_recovery.cc

@@ -669,13 +669,7 @@ void PGRecovery::on_activate_complete()
 void PGRecovery::on_backfill_reserved()
 {
   logger().debug("{}", __func__);
-  // yes, it's **not** backfilling yet. The PG_STATE_BACKFILLING
-  // will be set after on_backfill_reserved() returns.
-  // Backfill needs to take this into consideration when scheduling
-  // events -- they must be mutually exclusive with PeeringEvent
-  // instances. Otherwise the execution might begin without having
-  // the state updated.
-  ceph_assert(!pg->get_peering_state().is_backfilling());
+  ceph_assert(pg->get_peering_state().is_backfilling());
   // let's be lazy with creating the backfill stuff
   using BackfillState = crimson::osd::BackfillState;
   if (!backfill_state) {

src/osd/PeeringState.cc

@@ -5081,10 +5081,10 @@ PeeringState::Backfilling::Backfilling(my_context ctx)
 
   DECLARE_LOCALS;
   ps->backfill_reserved = true;
-  pl->on_backfill_reserved();
   ps->state_clear(PG_STATE_BACKFILL_TOOFULL);
   ps->state_clear(PG_STATE_BACKFILL_WAIT);
   ps->state_set(PG_STATE_BACKFILLING);
+  pl->on_backfill_reserved();
   pl->publish_stats_to_osd();
 }