Merge pull request #59066 from xxhdx1985126/wip-67380

crimson/osd: cancel ongoing pglog-based recoveries on recovery defering

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>

diff --cc src/crimson/osd/pg.cc
Simple merge

diff --cc src/crimson/osd/pg.h
Simple merge

diff --cc src/crimson/osd/pg_recovery.cc
Simple merge

diff --cc src/crimson/osd/pg_recovery.h
index c2f289e3cf62b84bae24ab51219719049b5250a8,b1fb01dc12924419af13e0128e35895b1808ad8f..5afd6a3554c5a80f77125869f7d9467f3abafeaf
--- 1/src/crimson/osd/pg_recovery.h
--- 2/src/crimson/osd/pg_recovery.h
+++ b/src/crimson/osd/pg_recovery.h
@@@ -32,8 -33,8 +33,9 @@@ public
  
    interruptible_future<bool> start_recovery_ops(
      RecoveryBackend::RecoveryBlockingEvent::TriggerI&,
+     crimson::osd::PglogBasedRecovery &recover_op,
      size_t max_to_start);
 +  void on_activate_complete();
    void on_backfill_reserved();
    void dispatch_backfill_event(
      boost::intrusive_ptr<const boost::statechart::event_base> evt);