crimson/osd: move OSD and PG into ceph::osd

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 6fabf7f6cc3ec99bb24186ef42d94bbe2a0355f4..bbe225833e5372a6a5059fc4fb817200c7c7fcea 100644 (file)
--- 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 50ead9009709903bbc8e444c714b736f4ccc7c89..707abacfc25208be17881b30a479a3e13b67ac29 100644 (file)
--- 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 d4e3bd854a025922db3231c675a36053ab0315b4..a87ba49db27308068aee254f69182cc57437a967 100644 (file)
--- 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 dc26142ae034087ddc7c011c6dc47737ec516278..3c83724bd401af31e9a712d15b1659fe7f70189a 100644 (file)
--- 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 71a297a9582a89f167b5e83aca94a3440388c875..21d1cb56ac0a28bf9d2818e22b771c37260fdc61 100644 (file)
--- 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;