crimson/osd/pg_recovery: trigger BackfillState events synchronously

Fixes: https://tracker.ceph.com/issues/68306
Signed-off-by: Xuehan Xu <[email protected]>

Author: xxhdx1985126

src/crimson/osd/backfill_state.h

@@ -96,6 +96,9 @@ struct BackfillState {
     BackfillListener& backfill_listener;
     std::unique_ptr<PeeringFacade> peering_state;
     std::unique_ptr<PGFacade> pg;
+    void post_event(const sc::event_base &e) {
+      sc::state_machine<BackfillMachine, Initial>::post_event(e);
+    }
   };
 
 private:
@@ -298,6 +301,10 @@ struct BackfillState {
     const std::vector<pg_shard_t> &peers);
 
 
+  void post_event(boost::intrusive_ptr<const sc::event_base> evt) {
+    backfill_machine.post_event(*std::move(evt));
+  }
+
   bool is_triggered() const {
     return backfill_machine.triggering_event() != nullptr;
   }

src/crimson/osd/pg_recovery.cc

@@ -477,17 +477,6 @@ void PGRecovery::_committed_pushed_object(epoch_t epoch,
   }
 }
 
-template <class EventT>
-void PGRecovery::start_backfill_recovery(const EventT& evt)
-{
-  using BackfillRecovery = crimson::osd::BackfillRecovery;
-  std::ignore = pg->get_shard_services().start_operation<BackfillRecovery>(
-    static_cast<crimson::osd::PG*>(pg),
-    pg->get_shard_services(),
-    pg->get_osdmap_epoch(),
-    evt);
-}
-
 void PGRecovery::request_replica_scan(
   const pg_shard_t& target,
   const hobject_t& begin,
@@ -520,7 +509,8 @@ void PGRecovery::request_primary_scan(
   ).then_interruptible([this] (BackfillInterval bi) {
     logger().debug("request_primary_scan:{}", __func__);
     using BackfillState = crimson::osd::BackfillState;
-    start_backfill_recovery(BackfillState::PrimaryScanned{ std::move(bi) });
+    backfill_state->process_event(
+      BackfillState::PrimaryScanned{ std::move(bi) }.intrusive_from_this());
   });
 }
 
@@ -542,7 +532,13 @@ void PGRecovery::enqueue_push(
   }).then_interruptible([this, obj] {
     logger().debug("enqueue_push:{}", __func__);
     using BackfillState = crimson::osd::BackfillState;
-    start_backfill_recovery(BackfillState::ObjectPushed(std::move(obj)));
+    if (backfill_state->is_triggered()) {
+      backfill_state->post_event(
+       BackfillState::ObjectPushed(std::move(obj)).intrusive_from_this());
+    } else {
+      backfill_state->process_event(
+       BackfillState::ObjectPushed(std::move(obj)).intrusive_from_this());
+    }
   });
 }
 
@@ -694,5 +690,6 @@ void PGRecovery::on_backfill_reserved()
   // it may be we either start a completely new backfill (first
   // event since last on_activate_complete()) or to resume already
   // (but stopped one).
-  start_backfill_recovery(BackfillState::Triggered{});
+  backfill_state->process_event(
+    BackfillState::Triggered{}.intrusive_from_this());
 }

src/crimson/osd/recovery_backend.cc

@@ -335,11 +335,10 @@ RecoveryBackend::handle_scan_digest(
     bi.clear_objects();
     ::decode_noclear(bi.objects, p);
   }
-  shard_services.start_operation<crimson::osd::BackfillRecovery>(
-    static_cast<crimson::osd::PG*>(&pg),
-    shard_services,
-    pg.get_osdmap_epoch(),
-    crimson::osd::BackfillState::ReplicaScanned{ m.from, std::move(bi) });
+  auto recovery_handler = pg.get_recovery_handler();
+  recovery_handler->dispatch_backfill_event(
+    crimson::osd::BackfillState::ReplicaScanned{
+      m.from, std::move(bi) }.intrusive_from_this());
   return seastar::now();
 }