From a74948bc5095b32212189352c163030bfe10db71 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 23 Jun 2020 14:53:35 +0200 Subject: [PATCH] crimson/msgr: don't advertise the on-wire format v2.1. We don't support it yet. Signed-off-by: Radoslaw Zarzynski --- src/crimson/net/ProtocolV2.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index 597bfcddd4d..250734ae484 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -22,6 +22,8 @@ #include "Interceptor.h" #endif +#define CRIMSON_MSGR2_SUPPORTED_FEATURES (0ull) + using namespace ceph::msgr::v2; using crimson::common::local_conf; @@ -455,7 +457,7 @@ ProtocolV2::banner_exchange(bool is_connect) { // 1. prepare and send banner bufferlist banner_payload; - encode((uint64_t)CEPH_MSGR2_SUPPORTED_FEATURES, banner_payload, 0); + encode((uint64_t)CRIMSON_MSGR2_SUPPORTED_FEATURES, banner_payload, 0); encode((uint64_t)CEPH_MSGR2_REQUIRED_FEATURES, banner_payload, 0); bufferlist bl; @@ -466,7 +468,7 @@ ProtocolV2::banner_exchange(bool is_connect) logger().debug("{} SEND({}) banner: len_payload={}, supported={}, " "required={}, banner=\"{}\"", conn, bl.length(), len_payload, - CEPH_MSGR2_SUPPORTED_FEATURES, CEPH_MSGR2_REQUIRED_FEATURES, + CRIMSON_MSGR2_SUPPORTED_FEATURES, CEPH_MSGR2_REQUIRED_FEATURES, CEPH_BANNER_V2_PREFIX); INTERCEPT_CUSTOM(custom_bp_t::BANNER_WRITE, bp_type_t::WRITE); return write_flush(std::move(bl)).then([this] { @@ -521,7 +523,7 @@ ProtocolV2::banner_exchange(bool is_connect) peer_supported_features, peer_required_features); // Check feature bit compatibility - uint64_t supported_features = CEPH_MSGR2_SUPPORTED_FEATURES; + uint64_t supported_features = CRIMSON_MSGR2_SUPPORTED_FEATURES; uint64_t required_features = CEPH_MSGR2_REQUIRED_FEATURES; if ((required_features & peer_supported_features) != required_features) { logger().error("{} peer does not support all required features" -- 2.39.5