Skip to content

(v4.1.x) osc/rdma: fail query_btls if no endpoint for non-local peer is found #7951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2020
Merged

(v4.1.x) osc/rdma: fail query_btls if no endpoint for non-local peer is found #7951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions ompi/mca/osc/rdma/osc_rdma_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, struct mca_btl_b
{
struct mca_btl_base_module_t **possible_btls = NULL;
int comm_size = ompi_comm_size (comm);
int comm_rank = ompi_comm_rank (comm);
int rc = OMPI_SUCCESS, max_btls = 0;
unsigned int selected_latency = INT_MAX;
struct mca_btl_base_module_t *selected_btl = NULL;
Expand Down Expand Up @@ -842,10 +843,11 @@ static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, struct mca_btl_b
return OMPI_SUCCESS;
}

for (int i = 0 ; i < comm_size ; ++i) {
ompi_proc_t *proc = ompi_comm_peer_lookup (comm, i);
for (int rank = 0 ; rank < comm_size ; ++rank) {
ompi_proc_t *proc = ompi_comm_peer_lookup (comm, rank);
mca_bml_base_endpoint_t *endpoint;
int num_btls, prev_max;
bool found_btl = false;

endpoint = mca_bml_base_get_endpoint (proc);
if (NULL == endpoint) {
Expand Down Expand Up @@ -891,23 +893,30 @@ static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, struct mca_btl_b
for (int j = 0 ; j < max_btls ; ++j) {
if (endpoint->btl_rdma.bml_btls[i_btl].btl == possible_btls[j]) {
++btl_counts[j];
found_btl = true;
break;
} else if (NULL == possible_btls[j]) {
possible_btls[j] = endpoint->btl_rdma.bml_btls[i_btl].btl;
btl_counts[j] = 1;
found_btl = true;
break;
}
}
}
}

/* any non-local rank must have a usable btl */
if (!found_btl && comm_rank == rank) {
/* no btl = no rdma/atomics */
rc = OMPI_ERR_UNREACH;
break;
}
}

if (OMPI_SUCCESS != rc) {
free (possible_btls);
free (btl_counts);

/* no btl = no rdma/atomics */
return OMPI_ERR_NOT_AVAILABLE;
return rc;
}

for (int i = 0 ; i < max_btls ; ++i) {
Expand Down