Skip to content

Commit 9ae6cc8

Browse files
Ralph Castainbosilca
authored andcommitted
Support timeout values when performing connect/accept operations. Bump default timeout to 10 minutes so folks have time to start the partnering application
1 parent 8a794e4 commit 9ae6cc8

File tree

6 files changed

+631
-609
lines changed

6 files changed

+631
-609
lines changed

ompi/communicator/comm_cid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ static int ompi_comm_allreduce_pmix_reduce_complete (ompi_comm_request_t *reques
875875

876876
/* this macro is not actually non-blocking. if a non-blocking version becomes available this function
877877
* needs to be reworked to take advantage of it. */
878-
OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 60);
878+
OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 600); // give them 10 minutes
879879
OBJ_DESTRUCT(&info);
880880
if (OPAL_SUCCESS != rc) {
881881
OBJ_DESTRUCT(&pdat);

ompi/dpm/dpm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,
211211
info.data.string = opal_argv_join(members, ':');
212212
pdat.value.type = OPAL_STRING;
213213

214-
OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 60);
214+
OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 600); // give them 10 minutes
215215
OBJ_DESTRUCT(&info);
216216
if (OPAL_SUCCESS != rc) {
217217
OBJ_DESTRUCT(&pdat);
@@ -531,7 +531,7 @@ static int construct_peers(ompi_group_t *group, opal_list_t *peers)
531531
} else {
532532
proc_name = proct->super.proc_name;
533533
}
534-
534+
535535
/* add to the list of peers */
536536
nm = OBJ_NEW(opal_namelist_t);
537537
nm->name = proc_name;

0 commit comments

Comments
 (0)