crimson/net: print tx/rx messages using logger().debug()

so we can find them with less efforts.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc
index c966d4ba502dab259c444a7a1ebd656c360614a4..d86f2bcd1d7ce8dad51f63b43b9c6668424d6054 100644 (file)
--- a/src/crimson/net/ProtocolV2.cc
+++ b/src/crimson/net/ProtocolV2.cc
@@ -1385,8 +1385,9 @@ ceph::bufferlist ProtocolV2::do_sweep_messages(
 
     auto message = MessageFrame::Encode(header2,
         msg->get_payload(), msg->get_middle(), msg->get_data());
-    logger().debug("{} write msg type={} off={} seq={}",
-                   conn, header2.type, header2.data_off, header2.seq);
+    logger().debug("{} --> [{} {}] #{} === {} ({}) // {}",
+                  messenger, peer_name, conn.get_peer_addr(),
+                  msg->get_seq(), *msg, msg->get_type(), conn);
     bl.append(message.get_buffer(session_stream_handlers));
   });
 
@@ -1473,10 +1474,9 @@ seastar::future<> ProtocolV2::read_message(utime_t throttle_stamp)
 
     // note last received message.
     conn.in_seq = message->get_seq();
-    logger().debug("{} received message m={} seq={} from={} type={} {}",
-                   conn, message, message->get_seq(), message->get_source(),
-                   header.type, *message);
-
+    logger().debug("{} <== [{} {}] #{} === {} ({}) // {}",
+                  messenger, message->get_source(), conn.get_peer_addr(),
+                  message->get_seq(), *message, message->get_type(), conn);
     if (!conn.policy.lossy) {
       // ++ack_left;
     }

diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc
index 288f4b576c769401903e0542de2f1777b11e05d6..9e83f1b16a443dd6d3babb20ba2be096fd88688b 100644 (file)
--- a/src/crimson/net/SocketConnection.cc
+++ b/src/crimson/net/SocketConnection.cc
@@ -21,12 +21,6 @@
 
 using namespace ceph::net;
 
-namespace {
-  seastar::logger& logger() {
-    return ceph::get_logger(ceph_subsys_ms);
-  }
-}
-
 SocketConnection::SocketConnection(SocketMessenger& messenger,
                                    Dispatcher& dispatcher,
                                    bool is_msgr2)
@@ -56,7 +50,6 @@ seastar::future<bool> SocketConnection::is_connected()
 
 seastar::future<> SocketConnection::send(MessageRef msg)
 {
-  logger().debug("{} --> {} === {}", messenger, get_peer_addr(), *msg);
   // Cannot send msg from another core now, its ref counter can be contaminated!
   ceph_assert(seastar::engine().cpu_id() == shard_id());
   return seastar::smp::submit_to(shard_id(), [this, msg=std::move(msg)] {