From: Kefu Chai <kchai@redhat.com>
Date: Tue, 25 Jun 2019 05:18:56 +0000 (+0800)
Subject: Merge pull request #28689 from tchaikov/wip-crimson-add-me-to-crush
X-Git-Tag: v15.1.0~2368
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ba39253696f43e2f29e83289c3bbafffa169f9d;p=ceph.git

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>
---

2ba39253696f43e2f29e83289c3bbafffa169f9d
diff --cc src/crimson/osd/osd.h
index 802aa8c101fb,82969c449a61..7b55b6e311ba
--- a/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;