Run check_peer_config on RDMA-CM connections too

This commit is contained in:
Vitaliy Filippov
2025-04-02 01:32:28 +03:00
parent cf9738ddbe
commit 013f688ffe
2 changed files with 3 additions and 4 deletions
+2 -2
View File
@@ -628,7 +628,7 @@ void osd_messenger_t::check_peer_config(osd_client_t *cl)
}, },
}; };
#ifdef WITH_RDMA #ifdef WITH_RDMA
if (rdma_contexts.size()) if (!use_rdmacm && rdma_contexts.size())
{ {
// Choose the right context for the selected network // Choose the right context for the selected network
msgr_rdma_context_t *selected_ctx = choose_rdma_context(cl); msgr_rdma_context_t *selected_ctx = choose_rdma_context(cl);
@@ -701,7 +701,7 @@ void osd_messenger_t::check_peer_config(osd_client_t *cl)
return; return;
} }
#ifdef WITH_RDMA #ifdef WITH_RDMA
if (cl->rdma_conn && config["rdma_address"].is_string()) if (!use_rdmacm && cl->rdma_conn && config["rdma_address"].is_string())
{ {
msgr_rdma_address_t addr; msgr_rdma_address_t addr;
if (!msgr_rdma_address_t::from_string(config["rdma_address"].string_value().c_str(), &addr) || if (!msgr_rdma_address_t::from_string(config["rdma_address"].string_value().c_str(), &addr) ||
+1 -2
View File
@@ -522,6 +522,5 @@ void osd_messenger_t::rdmacm_established(rdma_cm_event *ev)
fprintf(stderr, "Successfully connected with OSD %ju using RDMA-CM\n", peer_osd); fprintf(stderr, "Successfully connected with OSD %ju using RDMA-CM\n", peer_osd);
// Add initial receive request(s) // Add initial receive request(s)
try_recv_rdma(cl); try_recv_rdma(cl);
osd_peer_fds[peer_osd] = cl->peer_fd; check_peer_config(cl);
on_connect_peer(peer_osd, cl->peer_fd);
} }