From 7f4e2d63c3aa2492d021fbe1def5020c17c369a2 Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Mon, 10 Jun 2019 17:28:10 -0700
Subject: [PATCH] crimson/osd: move OSD and PG into ceph::osd

Signed-off-by: Samuel Just <sjust@redhat.com>
---
 src/crimson/osd/main.cc | 6 +++---
 src/crimson/osd/osd.cc  | 4 ++++
 src/crimson/osd/osd.h   | 5 ++++-
 src/crimson/osd/pg.cc   | 6 +++++-
 src/crimson/osd/pg.h    | 2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 6fabf7f6cc3..bbe225833e5 100644
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
                                               CEPH_ENTITY_TYPE_OSD,
                                               &cluster_name,
                                               &conf_file_list);
-  seastar::sharded<OSD> osd;
+  seastar::sharded<ceph::osd::OSD> osd;
   seastar::sharded<ceph::net::SocketMessenger> cluster_msgr, client_msgr;
   seastar::sharded<ceph::net::SocketMessenger> hb_front_msgr, hb_back_msgr;
   using ceph::common::sharded_conf;
@@ -145,13 +145,13 @@ int main(int argc, char* argv[])
         if (config.count("mkfs")) {
           osd.invoke_on(
 	    0,
-	    &OSD::mkfs,
+	    &ceph::osd::OSD::mkfs,
 	    local_conf().get_val<uuid_d>("osd_uuid"),
 	    local_conf().get_val<uuid_d>("fsid")).then([] {
 	      seastar::engine().exit(0);
 	    }).get();
         } else {
-          osd.invoke_on(0, &OSD::start).get();
+          osd.invoke_on(0, &ceph::osd::OSD::start).get();
         }
       });
     });
diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 50ead900970..707abacfc25 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -47,6 +47,8 @@ namespace {
 using ceph::common::local_conf;
 using ceph::os::FuturizedStore;
 
+namespace ceph::osd {
+
 OSD::OSD(int id, uint32_t nonce,
          ceph::net::Messenger& cluster_msgr,
          ceph::net::Messenger& public_msgr,
@@ -1203,3 +1205,5 @@ seastar::future<> OSD::advance_pg_to(Ref<PG> pg, epoch_t to)
 	});
     });
 }
+
+}
diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h
index d4e3bd854a0..a87ba49db27 100644
--- a/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@ -33,7 +33,6 @@ class MOSDMap;
 class MOSDOp;
 class OSDMap;
 class OSDMeta;
-class PG;
 class Heartbeat;
 
 namespace ceph::mon {
@@ -50,6 +49,8 @@ namespace ceph::os {
   class Transaction;
 }
 
+namespace ceph::osd {
+class PG;
 
 class OSD : public ceph::net::Dispatcher,
 	    private OSDMapService,
@@ -254,3 +255,5 @@ private:
   seastar::future<> send_beacon();
   void update_heartbeat_peers();
 };
+
+}
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index dc26142ae03..3c83724bd40 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -40,6 +40,8 @@ namespace {
   }
 }
 
+namespace ceph::osd {
+
 using ceph::common::local_conf;
 
 class RecoverablePredicate : public IsPGRecoverablePredicate {
@@ -64,7 +66,7 @@ PG::PG(
   pg_pool_t&& pool,
   std::string&& name,
   cached_map_t osdmap,
-  ceph::osd::ShardServices &shard_services,
+  ShardServices &shard_services,
   ec_profile_t profile)
   : pgid{pgid},
     pg_whoami{pg_shard},
@@ -406,3 +408,5 @@ seastar::future<> PG::handle_op(ceph::net::Connection* conn,
     return conn->send(reply);
   });
 }
+
+}
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 71a297a9582..21d1cb56ac0 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -421,7 +421,7 @@ private:
 					     uint64_t limit);
 
 private:
-  ceph::osd::ShardServices &shard_services;
+  ShardServices &shard_services;
 
   cached_map_t osdmap;
   std::unique_ptr<PGBackend> backend;
-- 
2.39.5