From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Jun 2018 16:41:14 +0000 (-0500)
Subject: msg/simple/Accepter: fix my_addr == my_addrs.v[0] constraint
X-Git-Tag: v14.0.1~951^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d1284d7be1a1183a64962e91b22a03e98773597;p=ceph-ci.git

msg/simple/Accepter: fix my_addr == my_addrs.v[0] constraint

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

diff --git a/src/msg/simple/Accepter.cc b/src/msg/simple/Accepter.cc
index 0a1c96acf84..4216e59c1b0 100644
--- a/src/msg/simple/Accepter.cc
+++ b/src/msg/simple/Accepter.cc
@@ -273,6 +273,7 @@ int Accepter::rebind(const set<int>& avoid_ports)
   // adjust the nonce; we want our entity_addr_t to be truly unique.
   nonce += 1000000;
   msgr->my_addr.nonce = nonce;
+  msgr->my_addrs.v[0].nonce = nonce;
   ldout(msgr->cct,10) << __func__ << " new nonce " << nonce << " and addr "
 			<< msgr->my_addr << dendl;