]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg: restore peer addr checks
authorSage Weil <sage@redhat.com>
Thu, 20 Jul 2017 17:59:45 +0000 (13:59 -0400)
committerSage Weil <sage@redhat.com>
Thu, 20 Jul 2017 17:59:45 +0000 (13:59 -0400)
This was dropped in bf4938567943c80345966f9c5a3bdc75a913175b but should
not have been.  Since we are advertising the addr and not the bind
addr there is no reason to disable this check.

Signed-off-by: Sage Weil <sage@redhat.com>
src/msg/async/AsyncConnection.cc
src/msg/simple/Pipe.cc

index 3c535f765337b71689f16bbf4c000ffd7e43a440..fa3c76725ea9a27e80d5c1313d9dde743034259c 100644 (file)
@@ -978,8 +978,8 @@ ssize_t AsyncConnection::_process_connection()
                                 << " - presumably this is the same node!" << dendl;
           } else {
             ldout(async_msgr->cct, 10) << __func__ << " connect claims to be "
-                                << paddr << " not " << peer_addr
-                                << " (peer is possibly using public_bind_addr?) " << dendl;
+                                      << paddr << " not " << peer_addr << dendl;
+           goto fail;
           }
         }
 
index 355c2528f93801a4eea6957c443145293cab807b..4a7ab9acab7a0e6a2b8db601c1f9ac8cd008a38d 100644 (file)
@@ -1090,8 +1090,8 @@ int Pipe::connect()
              << paddr << " not " << peer_addr << " - presumably this is the same node!" << dendl;
     } else {
       ldout(msgr->cct,10) << "connect claims to be "
-             << paddr << " not " << peer_addr
-              << " (peer is possibly using public_bind_addr?) " << dendl;
+                         << paddr << " not " << peer_addr << dendl;
+      goto fail;
     }
   }