From: Kefu Chai <kchai@redhat.com>
Date: Mon, 17 Feb 2020 09:31:25 +0000 (+0800)
Subject: Merge pull request #32632 from cyx1231st/rfc-seastar-test-socket-nevermove
X-Git-Tag: v15.1.1~394
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb72aebb92f1bfce00aedaebf140789871eb943f;p=ceph-ci.git

Merge pull request #32632 from cyx1231st/rfc-seastar-test-socket-nevermove

crimson/net: configure seastar to accept on a fixed core

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

eb72aebb92f1bfce00aedaebf140789871eb943f
diff --cc src/crimson/osd/osd.cc
index 8657ce4353d,b226ab90256..b21a2041dce
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@@ -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();
    });
diff --cc src/crimson/osd/osd.h
index aa28cd8ba15,95c502636b2..64f19aac1f7
--- a/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@@ -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);