From d65d0c77d077aa126778d44e78185f2f02a6ac7b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 12 Apr 2019 14:11:48 -0500 Subject: [PATCH] msg/Connection: add is_msgr2() Signed-off-by: Sage Weil --- src/msg/Connection.h | 4 ++++ src/msg/async/AsyncConnection.cc | 8 +++++++- src/msg/async/AsyncConnection.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/msg/Connection.h b/src/msg/Connection.h index a00b3292be1f8..a98e0e12a5347 100644 --- a/src/msg/Connection.h +++ b/src/msg/Connection.h @@ -110,6 +110,10 @@ public: */ virtual bool is_connected() = 0; + virtual bool is_msgr2() const { + return false; + } + Messenger *get_messenger() { return msgr; } diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index a364e58add6fe..b2150f175b1e7 100644 --- a/src/msg/async/AsyncConnection.cc +++ b/src/msg/async/AsyncConnection.cc @@ -152,10 +152,16 @@ AsyncConnection::~AsyncConnection() ceph_assert(!delay_state); } -int AsyncConnection::get_con_mode() const { +int AsyncConnection::get_con_mode() const +{ return protocol->get_con_mode(); } +bool AsyncConnection::is_msgr2() const +{ + return protocol->proto_type == 2; +} + void AsyncConnection::maybe_start_delay_thread() { if (!delay_state) { diff --git a/src/msg/async/AsyncConnection.h b/src/msg/async/AsyncConnection.h index 5b914cc5e6391..3ce26e6d52a39 100644 --- a/src/msg/async/AsyncConnection.h +++ b/src/msg/async/AsyncConnection.h @@ -228,6 +228,8 @@ class AsyncConnection : public Connection { return logger; } + bool is_msgr2() const override; + friend class Protocol; friend class ProtocolV1; friend class ProtocolV2; -- 2.39.5