From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 11 Sep 2024 06:13:59 +0000 (+0300)
Subject: Merge pull request #59066 from xxhdx1985126/wip-67380
X-Git-Tag: v20.0.0~1085
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc70b448755a82a24a0aeafcc820dc361e045234;p=ceph.git

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

fc70b448755a82a24a0aeafcc820dc361e045234
diff --cc src/crimson/osd/pg_recovery.h
index c2f289e3cf62,b1fb01dc1292..5afd6a3554c5
--- a/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);