]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/ProtocolV2: fix l_msgr_recv_bytes calculation
authorIlya Dryomov <idryomov@gmail.com>
Sat, 25 Apr 2020 10:51:16 +0000 (12:51 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 13 Jul 2020 12:45:13 +0000 (14:45 +0200)
l_msgr_recv_bytes calculation was never updated from msgr1.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit dcf30f511c9e10fb861445242be8786da98d682e)

src/msg/async/ProtocolV2.cc

index 7ab272b0405239de31ec29429d71f1a09087d0b3..28614073936c99e108fe8a34ce637052d4a77dd1 100644 (file)
@@ -1308,7 +1308,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);
 
@@ -1424,9 +1423,8 @@ CtPtr ProtocolV2::handle_message() {
   state = READY;
 
   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);
   auto fast_dispatch_time = ceph::mono_clock::now();