From 24f01201dc3de78f5ff8b0b6e3a17dc47a44e330 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Thu, 11 Jul 2019 21:10:00 +0800 Subject: [PATCH] crimson/net: unify loggings for message exchange * remove duplicated information in message logs, because connection prefix already contains information about: "[my_name(my_logic_name) my_addr >> peer_name peer_addr]" * unify message logs for both v1 and v2; * continue to use familiar identifiers to highlight message logs: - received messages identified by "<== #seq === msg (type)"; - sent messages identified by "--> #seq === msg (type)"; Signed-off-by: Yingxin Cheng --- src/crimson/net/ProtocolV1.cc | 6 ++++-- src/crimson/net/ProtocolV2.cc | 10 ++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/crimson/net/ProtocolV1.cc b/src/crimson/net/ProtocolV1.cc index 48b628684af36..30aa864286539 100644 --- a/src/crimson/net/ProtocolV1.cc +++ b/src/crimson/net/ProtocolV1.cc @@ -699,6 +699,8 @@ ceph::bufferlist ProtocolV1::do_sweep_messages( if (session_security) { session_security->sign_message(msg.get()); } + logger().debug("{} --> #{} === {} ({})", + conn, msg->get_seq(), *msg, msg->get_type()); bl.append(CEPH_MSGR_TAG_MSG); bl.append((const char*)&header, sizeof(header)); bl.append(msg->get_payload()); @@ -819,8 +821,8 @@ seastar::future<> ProtocolV1::read_message() // start dispatch, ignoring exceptions from the application layer seastar::with_gate(pending_dispatch, [this, msg = std::move(msg_ref)] { - logger().debug("{} <= {}@{} === {}", messenger, - msg->get_source(), conn.peer_addr, *msg); + logger().debug("{} <== #{} === {} ({})", + conn, msg->get_seq(), *msg, msg->get_type()); return dispatcher.ms_dispatch(&conn, std::move(msg)) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_dispatch caught exception: {}", conn, eptr); diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index e7b529ce49a7f..bf71adb755c8f 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -1480,9 +1480,8 @@ ceph::bufferlist ProtocolV2::do_sweep_messages( auto message = MessageFrame::Encode(header2, msg->get_payload(), msg->get_middle(), msg->get_data()); - logger().debug("{} --> [{} {}] #{} === {} ({}) // {}", - messenger, conn.get_peer_name(), conn.get_peer_addr(), - msg->get_seq(), *msg, msg->get_type(), conn); + logger().debug("{} --> #{} === {} ({})", + conn, msg->get_seq(), *msg, msg->get_type()); bl.append(message.get_buffer(session_stream_handlers)); }); @@ -1569,9 +1568,8 @@ seastar::future<> ProtocolV2::read_message(utime_t throttle_stamp) // note last received message. conn.in_seq = message->get_seq(); - logger().debug("{} <== [{} {}] #{} === {} ({}) // {}", - messenger, message->get_source(), conn.get_peer_addr(), - message->get_seq(), *message, message->get_type(), conn); + logger().debug("{} <== #{} === {} ({})", + conn, message->get_seq(), *message, message->get_type()); if (!conn.policy.lossy) { // ++ack_left; } -- 2.39.5