From 1a41f3c16f5f609e19a265bc374aede4068854cb Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 21 Oct 2021 12:51:25 +0000 Subject: [PATCH] crimson/net: don't enforce peer-perceived-myaddr matches myaddr if haven't learned it yet. Signed-off-by: Radoslaw Zarzynski --- src/crimson/net/ProtocolV2.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index 7c5b10e715b..b7aef560b68 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -1493,8 +1493,9 @@ void ProtocolV2::execute_accepting() conn, ceph_entity_type_name(_peer_type), conn.policy.lossy, conn.policy.server, conn.policy.standby, conn.policy.resetcheck); - if (messenger.get_myaddr().get_port() != _my_addr_from_peer.get_port() || - messenger.get_myaddr().get_nonce() != _my_addr_from_peer.get_nonce()) { + if (!messenger.get_myaddr().is_blank_ip() && + (messenger.get_myaddr().get_port() != _my_addr_from_peer.get_port() || + messenger.get_myaddr().get_nonce() != _my_addr_from_peer.get_nonce())) { logger().warn("{} my_addr_from_peer {} port/nonce doesn't match myaddr {}", conn, _my_addr_from_peer, messenger.get_myaddr()); throw std::system_error( -- 2.39.5