Merge pull request #61232 from xxhdx1985126/wip-67888-followup

osd/PeeringState: rename "cancel_backfill" to "suspend_backfill"

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

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

diff --cc src/crimson/osd/backfill_state.h
index 517a02ea4df9df882b2cf32ec4871863e2110ce6,ebaf099b76fcc31caf821f1b6bd45ab404938535..aa0e2e9ae4fceeab12f92352db0cd14f1c6f9d0a
--- 1/src/crimson/osd/backfill_state.h
--- 2/src/crimson/osd/backfill_state.h
+++ b/src/crimson/osd/backfill_state.h
@@@ -59,11 -59,9 +59,11 @@@ struct BackfillState 
    struct RequestDone : sc::event<RequestDone> {
    };
  
-   struct CancelBackfill : sc::event<CancelBackfill> {
+   struct SuspendBackfill : sc::event<SuspendBackfill> {
    };
  
 +  struct ThrottleAcquired : sc::event<ThrottleAcquired> {
 +  };
  private:
    // internal events
    struct RequestPrimaryScanning : sc::event<RequestPrimaryScanning> {
@@@ -257,9 -255,8 +257,9 @@@ public
      using reactions = boost::mpl::list<
        sc::custom_reaction<ObjectPushed>,
        sc::transition<RequestDone, Done>,
-       sc::custom_reaction<CancelBackfill>,
+       sc::custom_reaction<SuspendBackfill>,
        sc::custom_reaction<Triggered>,
 +      sc::transition<ThrottleAcquired, Enqueuing>,
        sc::transition<sc::event_base, Crashed>>;
      explicit Waiting(my_context);
      sc::result react(ObjectPushed);

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
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge