From ed70f50b49ef7df26520401e19feeea1f588229b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 9 Jan 2019 15:39:41 -0600 Subject: [PATCH] msg/async: better debug output Signed-off-by: Sage Weil --- src/msg/async/AsyncConnection.cc | 3 ++- src/msg/async/ProtocolV1.cc | 7 +++++-- src/msg/async/ProtocolV2.cc | 7 +++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index cdfed844eca..13711c98bc9 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 33b06dbe768..3178f38ba2d 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(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 d249c8c7b25..faf51b7ce57 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(existing->protocol.get()); + ldout(cct,10) << __func__ << " existing=" << existing << " exproto=" + << exproto << dendl; assert(exproto->proto_type == 2); if (!exproto) { -- 2.39.5