From dcf30f511c9e10fb861445242be8786da98d682e Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sat, 25 Apr 2020 12:51:16 +0200 Subject: [PATCH] msg/async/ProtocolV2: fix l_msgr_recv_bytes calculation l_msgr_recv_bytes calculation was never updated from msgr1. Signed-off-by: Ilya Dryomov --- src/msg/async/ProtocolV2.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index 00dd0ac5d5d..8713add9197 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -1320,7 +1320,6 @@ CtPtr ProtocolV2::handle_message() { #endif recv_stamp = ceph_clock_now(); - // we need to get the size before std::moving segments data const size_t cur_msg_size = get_current_msg_size(); auto msg_frame = MessageFrame::Decode(rx_segments_data); @@ -1444,9 +1443,8 @@ CtPtr ProtocolV2::handle_message() { } connection->logger->inc(l_msgr_recv_messages); - connection->logger->inc( - l_msgr_recv_bytes, - cur_msg_size + sizeof(ceph_msg_header) + sizeof(ceph_msg_footer)); + connection->logger->inc(l_msgr_recv_bytes, + rx_frame_asm.get_frame_onwire_len()); messenger->ms_fast_preprocess(message); fast_dispatch_time = ceph::mono_clock::now(); -- 2.39.5