From a7e41bbbd1fd6068356955c48de9ae5be9cf1b2a Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 27 Oct 2021 20:54:11 +0000 Subject: [PATCH] msg/async: add simplified perf counters for encrypted traffic. This doesn't respect the complexity of the per-connection-type configurability of the secure mode. Signed-off-by: Radoslaw Zarzynski --- src/msg/async/ProtocolV2.cc | 11 +++++++++-- src/msg/async/Stack.h | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index 9cc56edd8bb71..272e3b583ccd9 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -562,8 +562,11 @@ ssize_t ProtocolV2::write_message(Message *m, bool more) { ldout(cct, 1) << __func__ << " error sending " << m << ", " << cpp_strerror(rc) << dendl; } else { - connection->logger->inc( - l_msgr_send_bytes, total_send_size - connection->outgoing_bl.length()); + const auto sent_bytes = total_send_size - connection->outgoing_bl.length(); + connection->logger->inc(l_msgr_send_bytes, sent_bytes); + if (session_stream_handlers.tx) { + connection->logger->inc(l_msgr_send_encrypted_bytes, sent_bytes); + } ldout(cct, 10) << __func__ << " sending " << m << (rc ? " continuely." : " done.") << dendl; } @@ -1483,6 +1486,10 @@ CtPtr ProtocolV2::handle_message() { connection->logger->inc(l_msgr_recv_messages); connection->logger->inc(l_msgr_recv_bytes, rx_frame_asm.get_frame_onwire_len()); + if (session_stream_handlers.rx) { + connection->logger->inc(l_msgr_recv_encrypted_bytes, + rx_frame_asm.get_frame_onwire_len()); + } messenger->ms_fast_preprocess(message); fast_dispatch_time = ceph::mono_clock::now(); diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h index 97201787c73cb..4b2226d2c4c77 100644 --- a/src/msg/async/Stack.h +++ b/src/msg/async/Stack.h @@ -203,6 +203,9 @@ enum { l_msgr_send_messages_queue_lat, l_msgr_handle_ack_lat, + l_msgr_recv_encrypted_bytes, + l_msgr_send_encrypted_bytes, + l_msgr_last, }; @@ -246,6 +249,9 @@ class Worker { plb.add_time_avg(l_msgr_send_messages_queue_lat, "msgr_send_messages_queue_lat", "Network sent messages lat"); plb.add_time_avg(l_msgr_handle_ack_lat, "msgr_handle_ack_lat", "Connection handle ack lat"); + plb.add_u64_counter(l_msgr_recv_encrypted_bytes, "msgr_recv_encrypted_bytes", "Network received encrypted bytes", NULL, 0, unit_t(UNIT_BYTES)); + plb.add_u64_counter(l_msgr_send_encrypted_bytes, "msgr_send_encrypted_bytes", "Network sent encrypted bytes", NULL, 0, unit_t(UNIT_BYTES)); + perf_logger = plb.create_perf_counters(); cct->get_perfcounters_collection()->add(perf_logger); } -- 2.39.5