From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 18 Apr 2025 08:47:09 +0000 (+0000)
Subject: Revert "crimson: clarify RecoveryBackend::handle_backfill_op"
X-Git-Tag: v21.0.0~3^2~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=639357e293e9192eba8c56f6870a76ab89d31c76;p=ceph.git

Revert "crimson: clarify RecoveryBackend::handle_backfill_op"

This reverts commit ecda6780c93db66865533a27dab5b0beb052f5fa.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc
index 6dbce7c1a2e4..7ca1d1359ed7 100644
--- a/src/crimson/osd/recovery_backend.cc
+++ b/src/crimson/osd/recovery_backend.cc
@@ -448,7 +448,7 @@ RecoveryBackend::handle_scan(
 }
 
 RecoveryBackend::interruptible_future<>
-RecoveryBackend::handle_backfill_op(
+RecoveryBackend::handle_recovery_op(
   Ref<MOSDFastDispatchOp> m,
   crimson::net::ConnectionXcoreRef conn)
 {
diff --git a/src/crimson/osd/recovery_backend.h b/src/crimson/osd/recovery_backend.h
index e1aef7c63d52..6adb83e11d1a 100644
--- a/src/crimson/osd/recovery_backend.h
+++ b/src/crimson/osd/recovery_backend.h
@@ -85,7 +85,7 @@ public:
 
   virtual interruptible_future<> handle_recovery_op(
     Ref<MOSDFastDispatchOp> m,
-    crimson::net::ConnectionXcoreRef conn) = 0;
+    crimson::net::ConnectionXcoreRef conn);
 
   virtual interruptible_future<> recover_object(
     const hobject_t& soid,
@@ -282,10 +282,6 @@ protected:
   void clean_up(ceph::os::Transaction& t, interrupt_cause_t why);
   virtual seastar::future<> on_stop() = 0;
 
-  virtual interruptible_future<> handle_backfill_op(
-    Ref<MOSDFastDispatchOp> m,
-    crimson::net::ConnectionXcoreRef conn);
-
   /**
    * replica_push_targets
    *
diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index c4218b15224e..05c2d2d7df3d 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -1372,8 +1372,8 @@ ReplicatedRecoveryBackend::handle_recovery_op(
     return handle_push_reply(
 	boost::static_pointer_cast<MOSDPGPushReply>(m));
   default:
-    // delegate backfill messages to parent class
-    return handle_backfill_op(std::move(m), conn);
+    // delegate to parent class for handling backend-agnostic recovery ops.
+    return RecoveryBackend::handle_recovery_op(std::move(m), conn);
   }
 }