Merge pull request #28689 from tchaikov/wip-crimson-add-me-to-crush

crimson/osd: add osd to crush when it boots

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

diff --cc src/crimson/os/cyan_store.cc
Simple merge

diff --cc src/crimson/osd/osd.cc
Simple merge

diff --cc src/crimson/osd/osd.h
index 802aa8c101fb62b5839ef1da5f4fd8e4208c9e1d,82969c449a614afc2d422fe4e37a5d758ffa507e..7b55b6e311ba15927ed6c238bc71f2b0ea2383c7
--- 1/src/crimson/osd/osd.h
--- 2/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@@ -52,13 -49,12 +52,13 @@@ namespace ceph::os 
    class Transaction;
  }
  
 -template<typename T> using Ref = boost::intrusive_ptr<T>;
 +namespace ceph::osd {
 +class PG;
  
- class OSD : public ceph::net::Dispatcher,
-           private OSDMapService,
-           private ceph::common::AuthHandler,
-           private ceph::mgr::WithStats {
+ class OSD final : public ceph::net::Dispatcher,
+                 private OSDMapService,
+                 private ceph::common::AuthHandler,
+                 private ceph::mgr::WithStats {
    seastar::gate gate;
    const int whoami;
    const uint32_t nonce;

diff --cc src/osd/OSD.cc
Simple merge