]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #32632 from cyx1231st/rfc-seastar-test-socket-nevermove
authorKefu Chai <kchai@redhat.com>
Mon, 17 Feb 2020 09:31:25 +0000 (17:31 +0800)
committerGitHub <noreply@github.com>
Mon, 17 Feb 2020 09:31:25 +0000 (17:31 +0800)
crimson/net: configure seastar to accept on a fixed core

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/crimson/osd/osd.cc
src/crimson/osd/osd.h
src/test/crimson/test_alien_echo.cc

index 8657ce4353dcc90136f358e539ef8afc75f6bc0e,b226ab90256cfa8a35ebf7fe040c4378910596a2..b21a2041dce9b65e606153f9a5fd82034bc6c504
@@@ -272,12 -271,8 +272,12 @@@ seastar::future<> OSD::start(
        return seastar::now();
      }
    }).then([this] {
-     return heartbeat->start(public_msgr.get_myaddrs(),
-                             cluster_msgr.get_myaddrs());
+     return heartbeat->start(public_msgr->get_myaddrs(),
+                             cluster_msgr->get_myaddrs());
 +  }).then([this] {
 +    // create the admin-socket server, and the objects that register
 +    // to handle incoming commands
 +    return start_asok_admin();
    }).then([this] {
      return start_boot();
    });
index aa28cd8ba1536e72510542543fe3457846c0b40d,95c502636b25cad83189ee5bc71e2757d4189358..64f19aac1f7bcf59b4d54cbafe338d4f5489b714
@@@ -114,15 -115,12 +114,15 @@@ class OSD final : public crimson::net::
    std::unique_ptr<Heartbeat> heartbeat;
    seastar::timer<seastar::lowres_clock> heartbeat_timer;
  
 +  // admin-socket
 +  seastar::lw_shared_ptr<crimson::admin::AdminSocket> asok;
 +
  public:
    OSD(int id, uint32_t nonce,
-       crimson::net::Messenger& cluster_msgr,
-       crimson::net::Messenger& client_msgr,
-       crimson::net::Messenger& hb_front_msgr,
-       crimson::net::Messenger& hb_back_msgr);
+       crimson::net::MessengerRef cluster_msgr,
+       crimson::net::MessengerRef client_msgr,
+       crimson::net::MessengerRef hb_front_msgr,
+       crimson::net::MessengerRef hb_back_msgr);
    ~OSD() final;
  
    seastar::future<> mkfs(uuid_d osd_uuid, uuid_d cluster_fsid);
Simple merge