fixup: crimson/osd: bring ECRecoveryBackend, phase 0.1

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

diff --git a/src/crimson/osd/ec_recovery_backend.cc b/src/crimson/osd/ec_recovery_backend.cc
index ee2cab7f2c3f181198ab5617c315d275dd8ac979..0aab51a970aef5d563287da7ed1c2a44aaffc666 100644 (file)
--- a/src/crimson/osd/ec_recovery_backend.cc
+++ b/src/crimson/osd/ec_recovery_backend.cc
@@ -21,12 +21,14 @@ namespace {
   }
 }
 
+namespace crimson::osd {
+
 ECRecoveryBackend::ECRecoveryBackend(
   crimson::osd::PG& pg,
   crimson::osd::ShardServices& shard_services,
   crimson::os::CollectionRef coll,
   ECBackend* backend)
-: ::RecoveryBackend(pg, shard_services, coll, backend),
+: ::crimson::osd::RecoveryBackend(pg, shard_services, coll, backend),
   ::ECCommon::RecoveryBackend(
     shard_services.get_cct(),
     coll->get_cid(),
@@ -73,7 +75,7 @@ void ECRecoveryBackend::commit_txn_send_replies(
   std::map<int, MOSDPGPushReply*> replies)
 {
   std::ignore = shard_services.get_store().do_transaction(
-    ::RecoveryBackend::coll, std::move(txn)
+    crimson::osd::RecoveryBackend::coll, std::move(txn)
   ).then([replies=std::move(replies), this]() mutable {
     if (auto msgit = replies.find(get_parent()->whoami_shard().osd);
         msgit != std::end(replies)) {
@@ -189,6 +191,8 @@ ECRecoveryBackend::handle_recovery_op(
       boost::static_pointer_cast<MOSDPGPushReply>(m));
   default:
     // delegate backfill messages to parent class
-    return handle_backfill_op(std::move(m), conn);
+    return ::crimson::osd::RecoveryBackend::handle_recovery_op(std::move(m), conn);
   }
 }
+
+} // namespace crimson::osd

diff --git a/src/crimson/osd/ec_recovery_backend.h b/src/crimson/osd/ec_recovery_backend.h
index 66fdd67deaf1e1c465676006c5773ac6d0e753eb..15fbf1be864dac1a039cd24117c4d5b7fcbbec66 100644 (file)
--- a/src/crimson/osd/ec_recovery_backend.h
+++ b/src/crimson/osd/ec_recovery_backend.h
@@ -23,13 +23,12 @@
 #include "osd/recovery_types.h"
 #include "osd/osd_types.h"
 
-namespace crimson::osd{
-  class PG;
-}
-
 class PGBackend;
 
-class ECRecoveryBackend : public RecoveryBackend,
+namespace crimson::osd {
+class PG;
+
+class ECRecoveryBackend : public crimson::osd::RecoveryBackend,
                          private ECCommon::RecoveryBackend {
 public:
   ECRecoveryBackend(crimson::osd::PG& pg,
@@ -64,3 +63,5 @@ private:
   interruptible_future<> handle_push_reply(
     Ref<MOSDPGPushReply> m);
 };
+
+} // namespace crimson::osd