RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-10 02:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36268 from tchaikov/wip-crimson-msgr

Browse Source 
crimson/net: do not reset need_addr before learning it

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
This commit is contained in:
Kefu Chai 2020-07-24 18:17:14 +08:00 committed by GitHub
commit 2731d1b3f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crimson/net/SocketMessenger.cc
View File

@ -199,13 +199,13 @@ seastar::future<> SocketMessenger::learned_addr(const entity_addr_t &peer_addr_f
}
return seastar::now();
}
need_addr = false;
if (get_myaddr().get_type() == entity_addr_t::TYPE_NONE) {
// Not bound
entity_addr_t addr = peer_addr_for_me;
addr.set_type(entity_addr_t::TYPE_ANY);
addr.set_port(0);
need_addr = false;
return set_myaddrs(entity_addrvec_t{addr}
).then([this, &conn, peer_addr_for_me] {
logger().info("{} learned myaddr={} (unbound) from {}",
@ -230,6 +230,7 @@ seastar::future<> SocketMessenger::learned_addr(const entity_addr_t &peer_addr_f
entity_addr_t addr = peer_addr_for_me;
addr.set_type(get_myaddr().get_type());
addr.set_port(get_myaddr().get_port());
need_addr = false;
return set_myaddrs(entity_addrvec_t{addr}
).then([this, &conn, peer_addr_for_me] {
logger().info("{} learned myaddr={} (blank IP) from {}",
@ -241,6 +242,7 @@ seastar::future<> SocketMessenger::learned_addr(const entity_addr_t &peer_addr_f
throw std::system_error(
make_error_code(crimson::net::error::bad_peer_address));
} else {
need_addr = false;
return seastar::now();
}
}