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 6dbce7c1a2e42c6e8e1d3d2bf0ed59580c0c2c61..7ca1d1359ed7141e152695a6d40ca384f32371a7 100644 (file)
--- 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 e1aef7c63d521c695cbbead6c6f5ea590164e98d..6adb83e11d1a9a1dcf5acf6d527af0b2dae68a92 100644 (file)
--- 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 c4218b15224e419e04a96f5fddbb15b0f4f8cf2f..05c2d2d7df3dbb4763dc5bd24c550659a3da880b 100644 (file)
--- 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);
   }
 }