msg/async: print all addrs on debug lines

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

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 1157857a9ed2ed82ee5f2612d9da7f501a57ce6c..95828b57d0f4f1b56a8c8b7549b674b0acb8130c 100644 (file)
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -36,8 +36,8 @@
 #undef dout_prefix
 #define dout_prefix _conn_prefix(_dout)
 ostream& AsyncConnection::_conn_prefix(std::ostream *_dout) {
-  return *_dout << "-- " << socket_addr << " >> "
-               << target_addr << " conn(" << this
+  return *_dout << "-- " << async_msgr->get_myaddrs() << " >> "
+               << peer_addrs << " conn(" << this
                << (msgr2 ? " msgr2" : " legacy")
                 << " :" << port
                 << " s=" << get_state_name(state)

diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index e4d2ca658ad129a5f234e3dfdd4c21dc8aac5b17..ab4b526105f1ca5d82a285adc34e2e28e747d8c4 100644 (file)
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -14,7 +14,7 @@
 #undef dout_prefix
 #define dout_prefix _conn_prefix(_dout)
 ostream &ProtocolV1::_conn_prefix(std::ostream *_dout) {
-  return *_dout << "-- " << messenger->get_myaddrs().legacy_addr() << " >> "
+  return *_dout << "--1- " << messenger->get_myaddrs().legacy_addr() << " >> "
                 << connection->peer_addrs.legacy_addr() << " conn("
                 << connection << (connection->msgr2 ? " msgr2" : " legacy")
                 << " :" << connection->port << " s=" << get_state_name(state)

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index c3780f50e2921f9788a6e0bc5e08eff4f6057e7a..56b5a4906ad95a7bebb1d5365219598d0431a786 100644 (file)
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -14,8 +14,8 @@
 #undef dout_prefix
 #define dout_prefix _conn_prefix(_dout)
 ostream &ProtocolV2::_conn_prefix(std::ostream *_dout) {
-  return *_dout << "-- " << connection->socket_addr << " >> "
-                << connection->target_addr << " conn("
+  return *_dout << "--2- " << messenger->get_myaddrs() << " >> "
+                << connection->peer_addrs << " conn("
                 << connection << (connection->msgr2 ? " msgr2" : " legacy")
                 << " :" << connection->port << " s=" << get_state_name(state)
                 << " pgs=" << peer_global_seq << " cs=" << connect_seq