From 0f0c6f10bcfe3c282cac4e09b44bcd0655c484c3 Mon Sep 17 00:00:00 2001 From: Vu Pham Date: Tue, 23 Jun 2015 14:18:34 -0700 Subject: [PATCH] xio: fix to work with commit 626360aa Fix xio to work with commit 626360aa "msg, ceph_osd: Support feature bits for all message type's local connection" Signed-off-by: Vu Pham --- src/msg/xio/XioConnection.cc | 2 +- src/msg/xio/XioMessenger.cc | 7 ++++--- src/msg/xio/XioMessenger.h | 5 +++-- src/test/messenger/xio_client.cc | 2 +- src/test/messenger/xio_server.cc | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/msg/xio/XioConnection.cc b/src/msg/xio/XioConnection.cc index 6a2ae2e1270b..b8b62e24bbc2 100644 --- a/src/msg/xio/XioConnection.cc +++ b/src/msg/xio/XioConnection.cc @@ -142,7 +142,7 @@ XioConnection::XioConnection(XioMessenger *m, XioConnection::type _type, " throttle_msgs: " << xopt << " throttle_bytes: " << bytes_opt << dendl; /* XXXX fake features, aieee! */ - set_features(XIO_ALL_FEATURES); + set_features(m->local_features); } int XioConnection::send_message(Message *m) diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc index ad87af181298..24278e5466fd 100644 --- a/src/msg/xio/XioMessenger.cc +++ b/src/msg/xio/XioMessenger.cc @@ -250,8 +250,8 @@ static string xio_uri_from_entity(const string &type, /* XioMessenger */ XioMessenger::XioMessenger(CephContext *cct, entity_name_t name, - string mname, uint64_t _nonce, - DispatchStrategy *ds, uint64_t features) + string mname, uint64_t _nonce, uint64_t features, + DispatchStrategy *ds) : SimplePolicyMessenger(cct, name, mname, _nonce), nsessions(0), shutdown_called(false), @@ -379,7 +379,8 @@ XioMessenger::XioMessenger(CephContext *cct, entity_name_t name, /* update class instance count */ nInstances.inc(); - loop_con.set_features(features); + local_features = features; + loop_con->set_features(features); } /* ctor */ diff --git a/src/msg/xio/XioMessenger.h b/src/msg/xio/XioMessenger.h index e1bfe9c334b8..d6bb5b5d22d9 100644 --- a/src/msg/xio/XioMessenger.h +++ b/src/msg/xio/XioMessenger.h @@ -53,8 +53,8 @@ private: public: XioMessenger(CephContext *cct, entity_name_t name, - string mname, uint64_t nonce, - DispatchStrategy* ds = new QueueStrategy(1), uint64_t features); + string mname, uint64_t nonce, uint64_t features, + DispatchStrategy* ds = new QueueStrategy(1)); virtual ~XioMessenger(); @@ -151,6 +151,7 @@ protected: { } public: + uint64_t local_features; }; #endif /* XIO_MESSENGER_H */ diff --git a/src/test/messenger/xio_client.cc b/src/test/messenger/xio_client.cc index 29f807f9c25e..414668f37e88 100644 --- a/src/test/messenger/xio_client.cc +++ b/src/test/messenger/xio_client.cc @@ -117,7 +117,7 @@ int main(int argc, const char **argv) messenger = new XioMessenger(g_ceph_context, entity_name_t::MON(-1), "xio_client", - 0 /* nonce */, + 0 /* nonce */, XIO_ALL_FEATURES, dstrategy); // enable timing prints diff --git a/src/test/messenger/xio_server.cc b/src/test/messenger/xio_server.cc index ee74b791a61f..039aa7b1b70a 100644 --- a/src/test/messenger/xio_server.cc +++ b/src/test/messenger/xio_server.cc @@ -88,7 +88,7 @@ int main(int argc, const char **argv) messenger = new XioMessenger(g_ceph_context, entity_name_t::MON(-1), "xio_server", - 0 /* nonce */, + 0 /* nonce */, XIO_ALL_FEATURES, dstrategy); static_cast(messenger)->set_magic( -- 2.47.3