Merge pull request ceph#64275 from xxhdx1985126/wip-crimson-backedn-namespace

crimson/osd: put PGBackend/RecoveryBackend/PGRecovery and other related classes into the crimson::osd  namespace

Reviewed-by: Xuehan Xu <[email protected]>

Author: Matan-B

src/crimson/osd/ec_backend.cc

@@ -2,6 +2,8 @@
 
 #include "crimson/osd/shard_services.h"
 
+namespace crimson::osd {
+
 ECBackend::ECBackend(shard_id_t shard,
                      ECBackend::CollectionRef coll,
                      crimson::osd::ShardServices& shard_services,
@@ -35,3 +37,5 @@ ECBackend::submit_transaction(const std::set<pg_shard_t> &pg_shards,
   // todo
   return make_ready_future<rep_op_ret_t>(seastar::now(), seastar::now());
 }
+
+}

src/crimson/osd/ec_backend.h

@@ -9,6 +9,8 @@
 #include "osd/osd_types.h"
 #include "pg_backend.h"
 
+namespace crimson::osd {
+
 class ECBackend : public PGBackend
 {
 public:
@@ -39,3 +41,5 @@ class ECBackend : public PGBackend
     return seastar::now();
   }
 };
+
+}

src/crimson/osd/pg.h

@@ -47,8 +47,6 @@
 
 class MQuery;
 class OSDMap;
-class PGBackend;
-class ReplicatedBackend;
 class PGPeeringEvent;
 class osd_op_params_t;
 
@@ -68,6 +66,8 @@ namespace crimson::osd {
 class OpsExecuter;
 class SnapTrimEvent;
 class PglogBasedRecovery;
+class PGBackend;
+class ReplicatedBackend;
 
 class PG : public boost::intrusive_ref_counter<
   PG,
@@ -1014,7 +1014,7 @@ class PG : public boost::intrusive_ref_counter<
 
 private:
   friend class IOInterruptCondition;
-  friend class ::ReplicatedBackend;
+  friend class ReplicatedBackend;
   struct log_update_t {
     std::set<pg_shard_t> waiting_on;
     seastar::shared_promise<> all_committed;

src/crimson/osd/pg_backend.cc

@@ -43,6 +43,8 @@ using std::string;
 using std::string_view;
 using crimson::common::local_conf;
 
+namespace crimson::osd {
+
 std::unique_ptr<PGBackend>
 PGBackend::create(pg_t pgid,
 		  const pg_shard_t pg_shard,
@@ -1852,3 +1854,4 @@ void PGBackend::clone_for_write(
   txn.rmattr(coll->get_cid(), ghobject_t{to}, SS_ATTR);
 }
 
+}

src/crimson/osd/pg_backend.h

@@ -29,10 +29,9 @@ namespace ceph::os {
 }
 
 namespace crimson::osd {
-  class ShardServices;
-  class PG;
-  class ObjectContextLoader;
-}
+class ShardServices;
+class PG;
+class ObjectContextLoader;
 
 class PGBackend
 {
@@ -517,3 +516,5 @@ class PGBackend
 
   friend class RecoveryBackend;
 };
+
+}

src/crimson/osd/pg_recovery.cc

@@ -22,7 +22,8 @@ SET_SUBSYS(osd);
 
 using std::map;
 using std::set;
-using PglogBasedRecovery = crimson::osd::PglogBasedRecovery;
+
+namespace crimson::osd {
 
 void PGRecovery::start_pglogbased_recovery()
 {
@@ -711,3 +712,5 @@ void PGRecovery::on_backfill_reserved()
   backfill_state->process_event(
     BackfillState::Triggered{}.intrusive_from_this());
 }
+
+}

src/crimson/osd/pg_recovery.h

@@ -15,12 +15,11 @@
 
 #include "osd/object_state.h"
 
+class MOSDPGBackfillRemove;
+
 namespace crimson::osd {
 class UrgentRecovery;
 class PglogBasedRecovery;
-}
-
-class MOSDPGBackfillRemove;
 class PGBackend;
 
 class PGRecovery : public crimson::osd::BackfillState::BackfillListener {
@@ -148,3 +147,5 @@ class PGRecovery : public crimson::osd::BackfillState::BackfillListener {
   friend crimson::osd::PG;
   // backfill end
 };
+
+}

src/crimson/osd/pg_recovery_listener.h

@@ -10,10 +10,8 @@
 #include "osd/osd_types.h"
 
 namespace crimson::osd {
-  class ShardServices;
-  class PglogBasedRecovery;
-};
-
+class ShardServices;
+class PglogBasedRecovery;
 class RecoveryBackend;
 class PGRecovery;
 
@@ -45,3 +43,5 @@ class PGRecoveryListener {
   virtual void reset_pglog_based_recovery_op() = 0;
   virtual void schedule_event_after(PGPeeringEventRef evt, float delay) = 0;
 };
+
+}

src/crimson/osd/recovery_backend.cc

@@ -16,6 +16,8 @@
 
 SET_SUBSYS(osd);
 
+namespace crimson::osd {
+
 hobject_t RecoveryBackend::get_temp_recovery_object(
   const hobject_t& target,
   eversion_t version) const
@@ -459,3 +461,5 @@ RecoveryBackend::handle_backfill_op(
 					  (uint16_t)m->get_header().type)));
   }
 }
+
+}

src/crimson/osd/recovery_backend.h

@@ -19,9 +19,8 @@
 #include "osd/recovery_types.h"
 #include "osd/osd_types.h"
 
-namespace crimson::osd{
-  class PG;
-}
+namespace crimson::osd {
+class PG;
 
 class RecoveryBackend {
 public:
@@ -306,3 +305,5 @@ class RecoveryBackend {
     crimson::net::ConnectionXcoreRef conn);
   interruptible_future<> handle_backfill_remove(MOSDPGBackfillRemove& m);
 };
+
+}