]> git-server-git.apps.pok.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>
Sun, 14 Jun 2020 11:56:09 +0000 (11:56 +0000)
l_msgr_recv_bytes calculation was never updated from msgr1.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
src/msg/async/ProtocolV2.cc

index 00dd0ac5d5d61bd4b5e540d4f03785dd3f6ae48d..8713add919724ae545ab494ddcd9e426a0460806 100644 (file)
@@ -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();