]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
xio: save nonce for bind address
authorVu Pham <vu@mellanox.com>
Fri, 15 May 2015 16:52:20 +0000 (09:52 -0700)
committerVu Pham <vu@mellanox.com>
Thu, 21 May 2015 13:59:59 +0000 (06:59 -0700)
A missing nonce in the osd addrs was preventing the monitor from
detecting osd restarts. XioMessenger::bind() now sets the nonce in the
same way that SimpleMessenger and AsyncMessenger do

Signed-off-by: Casey Bodley <casey@cohortfs.com>
Signed-off-by: Vu Pham <vu@mellanox.com>
src/msg/xio/XioMessenger.cc

index 3cfe34aee9da568464310f43f594c50794ddac47..deb3e4251eebb50e9a2d96ddb0c8d345c1f0c9fc 100644 (file)
@@ -733,6 +733,7 @@ int XioMessenger::bind(const entity_addr_t& addr)
   int r = portals.bind(&xio_msgr_ops, base_uri, shift_addr.get_port(), &port0);
   if (r == 0) {
     shift_addr.set_port(port0);
+    shift_addr.nonce = nonce;
     set_myaddr(shift_addr);
     did_bind = true;
   }