From ecda6780c93db66865533a27dab5b0beb052f5fa Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 3 Jan 2025 22:54:49 +0000 Subject: [PATCH] crimson: clarify RecoveryBackend::handle_backfill_op Should make it a bit easier to find the two kinds of message handlers. Signed-off-by: Samuel Just --- src/crimson/osd/recovery_backend.cc | 2 +- src/crimson/osd/recovery_backend.h | 6 +++++- src/crimson/osd/replicated_recovery_backend.cc | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc index aa13b9594c77f..e390d51ed06b8 100644 --- a/src/crimson/osd/recovery_backend.cc +++ b/src/crimson/osd/recovery_backend.cc @@ -360,7 +360,7 @@ RecoveryBackend::handle_scan( } RecoveryBackend::interruptible_future<> -RecoveryBackend::handle_recovery_op( +RecoveryBackend::handle_backfill_op( Ref m, crimson::net::ConnectionXcoreRef conn) { diff --git a/src/crimson/osd/recovery_backend.h b/src/crimson/osd/recovery_backend.h index 21154cb710679..2d755d54789fe 100644 --- a/src/crimson/osd/recovery_backend.h +++ b/src/crimson/osd/recovery_backend.h @@ -77,7 +77,7 @@ public: virtual interruptible_future<> handle_recovery_op( Ref m, - crimson::net::ConnectionXcoreRef conn); + crimson::net::ConnectionXcoreRef conn) = 0; virtual interruptible_future<> recover_object( const hobject_t& soid, @@ -268,6 +268,10 @@ 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 m, + crimson::net::ConnectionXcoreRef conn); private: void handle_backfill_finish( MOSDPGBackfill& m, diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc index 0d6c9d3823665..feb19a12675af 100644 --- a/src/crimson/osd/replicated_recovery_backend.cc +++ b/src/crimson/osd/replicated_recovery_backend.cc @@ -1356,8 +1356,8 @@ ReplicatedRecoveryBackend::handle_recovery_op( return handle_recovery_delete_reply( boost::static_pointer_cast(m)); default: - // delegate to parent class for handling backend-agnostic recovery ops. - return RecoveryBackend::handle_recovery_op(std::move(m), conn); + // delegate backfill messages to parent class + return handle_backfill_op(std::move(m), conn); } } -- 2.39.5