From: Sage Weil <sage@redhat.com>
Date: Wed, 15 Jun 2016 21:04:19 +0000 (-0400)
Subject: msg/simple: fix learned_addr
X-Git-Tag: v11.1.0~515^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ebd56502fd7ca3f541a72bfbd156c965e69ef0d;p=ceph.git

msg/simple: fix learned_addr

There is a type in entity_addr_t that needs to get set
too.

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

diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc
index d89c9d9ef55..7cf9d9cc50b 100644
--- a/src/msg/simple/SimpleMessenger.cc
+++ b/src/msg/simple/SimpleMessenger.cc
@@ -703,9 +703,10 @@ void SimpleMessenger::learned_addr(const entity_addr_t &peer_addr_for_me)
   if (need_addr) {
     entity_addr_t t = peer_addr_for_me;
     t.set_port(my_inst.addr.get_port());
-    ANNOTATE_BENIGN_RACE_SIZED(&my_inst.addr.u, sizeof(my_inst.addr.u),
+    t.set_nonce(my_inst.addr.get_nonce());
+    ANNOTATE_BENIGN_RACE_SIZED(&my_inst.addr, sizeof(my_inst.addr),
                                "SimpleMessenger learned addr");
-    my_inst.addr.u = t.u;
+    my_inst.addr = t;
     ldout(cct,1) << "learned my addr " << my_inst.addr << dendl;
     need_addr = false;
     init_local_connection();