Skip to content

Commit f18954d

Browse files
author
Ralph Castain
committed
Update ORTE to allocate network resources
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
1 parent 466cad6 commit f18954d

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

orte/mca/odls/base/odls_base_default_fns.c

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ int orte_odls_base_default_get_add_procs_data(opal_buffer_t *buffer,
151151
char *nidmap;
152152
orte_proc_t *dmn, *proc;
153153
opal_value_t *val = NULL, *kv;
154-
opal_list_t *modex;
154+
opal_list_t *modex, ilist;
155155
int n;
156156

157157
/* get the job data pointer */
@@ -432,11 +432,31 @@ int orte_odls_base_default_get_add_procs_data(opal_buffer_t *buffer,
432432

433433
/* get any application prep info */
434434
if (NULL != opal_pmix.server_setup_application) {
435+
OBJ_CONSTRUCT(&ilist, opal_list_t);
436+
/* request to allocate network resources */
437+
kv = OBJ_NEW(opal_value_t);
438+
kv->key = strdup(OPAL_PMIX_ALLOC_NETWORK_ID);
439+
kv->type = OPAL_STRING;
440+
asprintf(&kv->data.string, "%s.net", ORTE_JOBID_PRINT(jdata->jobid));
441+
opal_list_append(&ilist, &kv->super);
442+
/* ask for security keys */
443+
kv = OBJ_NEW(opal_value_t);
444+
kv->key = strdup(OPAL_PMIX_ALLOC_NETWORK_SEC_KEY);
445+
kv->type = OPAL_BOOL;
446+
kv->data.flag = true;
447+
opal_list_append(&ilist, &kv->super);
448+
/* ask for envars to be forwarded */
449+
kv = OBJ_NEW(opal_value_t);
450+
kv->key = strdup(OPAL_PMIX_SETUP_APP_ENVARS);
451+
kv->type = OPAL_BOOL;
452+
kv->data.flag = true;
453+
opal_list_append(&ilist, &kv->super);
435454
/* we don't want to block here because it could
436455
* take some indeterminate time to get the info */
437-
if (OPAL_SUCCESS != (rc = opal_pmix.server_setup_application(jdata->jobid, NULL, setup_cbfunc, jdata))) {
456+
if (OPAL_SUCCESS != (rc = opal_pmix.server_setup_application(jdata->jobid, &ilist, setup_cbfunc, jdata))) {
438457
ORTE_ERROR_LOG(rc);
439458
}
459+
OPAL_LIST_DESTRUCT(&ilist);
440460
return rc;
441461
}
442462

0 commit comments

Comments
 (0)