From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Dec 2018 13:17:12 +0000 (-0600)
Subject: msg/simple: behave when v2 and v1 addrs are present at target
X-Git-Tag: v14.1.0~484^2~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1cebd00a99121bc1bbf3da9caa1540c8f9c1534;p=ceph.git

msg/simple: behave when v2 and v1 addrs are present at target

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

diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc
index aa39bd5e27c0..1252e784449d 100644
--- a/src/msg/simple/SimpleMessenger.cc
+++ b/src/msg/simple/SimpleMessenger.cc
@@ -436,11 +436,11 @@ ConnectionRef SimpleMessenger::connect_to(int type,
 
   // remote
   while (true) {
-    Pipe *pipe = _lookup_pipe(addrs.front());
+    Pipe *pipe = _lookup_pipe(addrs.legacy_addr());
     if (pipe) {
       ldout(cct, 10) << "get_connection " << addrs << " existing " << pipe << dendl;
     } else {
-      pipe = connect_rank(addrs.front(), type, NULL, NULL);
+      pipe = connect_rank(addrs.legacy_addr(), type, NULL, NULL);
       ldout(cct, 10) << "get_connection " << addrs << " new " << pipe << dendl;
     }
     Mutex::Locker l(pipe->pipe_lock);