From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Jun 2016 17:06:09 +0000 (-0400)
Subject: msg/async: fix learned_addr
X-Git-Tag: v11.1.0~515^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2eea741e0420a3685fe03b069c3d5efe02dc578c;p=ceph.git

msg/async: fix learned_addr

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

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 19ee090a8ad7..f19dae71a39f 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -653,7 +653,8 @@ void AsyncMessenger::learned_addr(const entity_addr_t &peer_addr_for_me)
     need_addr = false;
     entity_addr_t t = peer_addr_for_me;
     t.set_port(my_inst.addr.get_port());
-    my_inst.addr.u = t.u;
+    t.set_nonce(my_inst.addr.get_nonce());
+    my_inst.addr = t;
     ldout(cct, 1) << __func__ << " learned my addr " << my_inst.addr << dendl;
     _init_local_connection();
   }