From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Jan 2019 21:39:41 +0000 (-0600)
Subject: msg/async: better debug output
X-Git-Tag: v14.1.0~416^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed70f50b49ef7df26520401e19feeea1f588229b;p=ceph.git

msg/async: better debug output

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index cdfed844eca5..13711c98bc93 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -38,7 +38,8 @@
 ostream& AsyncConnection::_conn_prefix(std::ostream *_dout) {
   return *_dout << "-- " << async_msgr->get_myaddrs() << " >> "
 		<< *peer_addrs << " conn(" << this
-		<< (msgr2 ? " msgr2" : " legacy")
+		<< (msgr2 ? " msgr2=" : " legacy=")
+		<< protocol.get()
                 << " :" << port
                 << " s=" << get_state_name(state)
                 << " l=" << policy.lossy
diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index 33b06dbe7683..3178f38ba2d3 100644
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -15,8 +15,9 @@
 #define dout_prefix _conn_prefix(_dout)
 ostream &ProtocolV1::_conn_prefix(std::ostream *_dout) {
   return *_dout << "--1- " << messenger->get_myaddrs().legacy_addr() << " >> "
-                << connection->peer_addrs->legacy_addr() << " conn("
-                << connection << (connection->msgr2 ? " msgr2" : " legacy")
+                << connection->peer_addrs->legacy_addr()
+		<< " conn("
+                << connection << " " << this
                 << " :" << connection->port << " s=" << get_state_name(state)
                 << " pgs=" << peer_global_seq << " cs=" << connect_seq
                 << " l=" << connection->policy.lossy << ").";
@@ -1984,6 +1985,8 @@ CtPtr ProtocolV1::handle_connect_message_2() {
                             // AsyncConnection here)
 
     ProtocolV1 *exproto = dynamic_cast<ProtocolV1 *>(existing->protocol.get());
+    ldout(cct,10) << __func__ << " existing=" << existing << " exproto="
+		  << exproto << dendl;
     assert(exproto->proto_type == 1);
 
     if (!exproto) {
diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index d249c8c7b257..faf51b7ce57f 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -15,8 +15,9 @@
 #define dout_prefix _conn_prefix(_dout)
 ostream &ProtocolV2::_conn_prefix(std::ostream *_dout) {
   return *_dout << "--2- " << messenger->get_myaddrs() << " >> "
-                << *connection->peer_addrs << " conn("
-                << connection << (connection->msgr2 ? " msgr2" : " legacy")
+                << *connection->peer_addrs
+		<< " conn("
+                << connection << " " << this
                 << " :" << connection->port << " s=" << get_state_name(state)
                 << " pgs=" << peer_global_seq << " cs=" << connect_seq
                 << " l=" << connection->policy.lossy << ").";
@@ -2032,6 +2033,8 @@ CtPtr ProtocolV2::handle_connect_message_2() {
                             // AsyncConnection here)
 
     ProtocolV2 *exproto = dynamic_cast<ProtocolV2 *>(existing->protocol.get());
+    ldout(cct,10) << __func__ << " existing=" << existing << " exproto="
+		  << exproto << dendl;
     assert(exproto->proto_type == 2);
 
     if (!exproto) {