From 013f688ffeb63af63143a48013f16faf20625633 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 2 Apr 2025 01:32:20 +0300 Subject: [PATCH] Run check_peer_config on RDMA-CM connections too --- src/client/messenger.cpp | 4 ++-- src/client/msgr_rdmacm.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/client/messenger.cpp b/src/client/messenger.cpp index f11dc2fa..2c3e0293 100644 --- a/src/client/messenger.cpp +++ b/src/client/messenger.cpp @@ -628,7 +628,7 @@ void osd_messenger_t::check_peer_config(osd_client_t *cl) }, }; #ifdef WITH_RDMA - if (rdma_contexts.size()) + if (!use_rdmacm && rdma_contexts.size()) { // Choose the right context for the selected network 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; } #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; if (!msgr_rdma_address_t::from_string(config["rdma_address"].string_value().c_str(), &addr) || diff --git a/src/client/msgr_rdmacm.cpp b/src/client/msgr_rdmacm.cpp index de27931e..2e51173a 100644 --- a/src/client/msgr_rdmacm.cpp +++ b/src/client/msgr_rdmacm.cpp @@ -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); // Add initial receive request(s) try_recv_rdma(cl); - osd_peer_fds[peer_osd] = cl->peer_fd; - on_connect_peer(peer_osd, cl->peer_fd); + check_peer_config(cl); }