From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Feb 2019 23:04:10 +0000 (-0600)
Subject: msg/async/ProtocolV1: use legacy v1 address, not any, in protocol
X-Git-Tag: v14.1.0~184^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c64bed3b2360c88d0888b2edd2e92bb699661c27;p=ceph.git

msg/async/ProtocolV1: use legacy v1 address, not any, in protocol

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

diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index 0240707a3018..d97099964d8d 100644
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -14,8 +14,8 @@
 #undef dout_prefix
 #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()
+  return *_dout << "--1- " << messenger->get_myaddrs() << " >> "
+                << *connection->peer_addrs
 		<< " conn("
                 << connection << " " << this
                 << " :" << connection->port << " s=" << get_state_name(state)
@@ -1385,7 +1385,7 @@ CtPtr ProtocolV1::handle_server_banner_and_identify(char *buffer, int r) {
   }
 
   bufferlist myaddrbl;
-  encode(messenger->get_myaddrs().legacy_addr(), myaddrbl, 0);  // legacy
+  encode(messenger->get_myaddr_legacy(), myaddrbl, 0);  // legacy
   return WRITE(myaddrbl, handle_my_addr_write);
 }
 
@@ -1398,7 +1398,7 @@ CtPtr ProtocolV1::handle_my_addr_write(int r) {
     return _fault();
   }
   ldout(cct, 10) << __func__ << " connect sent my addr "
-                 << messenger->get_myaddrs().legacy_addr() << dendl;
+                 << messenger->get_myaddr_legacy() << dendl;
 
   return CONTINUE(send_connect_message);
 }
@@ -1713,6 +1713,7 @@ CtPtr ProtocolV1::send_server_banner() {
 
   bl.append(CEPH_BANNER, strlen(CEPH_BANNER));
 
+  // as a server, we should have a legacy addr if we accepted this connection.
   auto legacy = messenger->get_myaddrs().legacy_addr();
   encode(legacy, bl, 0);  // legacy
   connection->port = legacy.get_port();
@@ -2077,7 +2078,7 @@ CtPtr ProtocolV1::handle_connect_message_2() {
       }
 
       // connection race?
-      if (connection->peer_addrs->legacy_addr() < messenger->get_myaddr() ||
+      if (connection->peer_addrs->legacy_addr() < messenger->get_myaddr_legacy() ||
           existing->policy.server) {
         // incoming wins
         ldout(cct, 10) << __func__ << " accept connection race, existing "
@@ -2092,7 +2093,7 @@ CtPtr ProtocolV1::handle_connect_message_2() {
             << ".cseq " << exproto->connect_seq
             << " == " << connect_msg.connect_seq << ", sending WAIT" << dendl;
         ceph_assert(connection->peer_addrs->legacy_addr() >
-                    messenger->get_myaddr());
+                    messenger->get_myaddr_legacy());
         existing->lock.unlock();
 	// make sure we follow through with opening the existing
 	// connection (if it isn't yet open) since we know the peer