From 082c39d68c2cdd73d03a9ddcc1e92de445c1c3e1 Mon Sep 17 00:00:00 2001 From: Boris Karasev Date: Fri, 28 Jul 2017 15:53:48 +0600 Subject: [PATCH] pmix: fixed immediate request This commit fixes a hang when using external PMIx v1 module Signed-off-by: Boris Karasev (cherry picked from commit e20b58152998979ab74710842fd1641d2f1f8b88) --- opal/mca/pmix/pmix.h | 2 +- orte/mca/ess/singleton/ess_singleton_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opal/mca/pmix/pmix.h b/opal/mca/pmix/pmix.h index 7e7e13fda5d..a3940ae402e 100644 --- a/opal/mca/pmix/pmix.h +++ b/opal/mca/pmix/pmix.h @@ -146,7 +146,7 @@ extern int opal_pmix_base_exchange(opal_value_t *info, OPAL_NAME_PRINT(*(p)), (s))); \ OBJ_CONSTRUCT(&(_ilist), opal_list_t); \ _info = OBJ_NEW(opal_value_t); \ - _info->key = strdup(OPAL_PMIX_IMMEDIATE); \ + _info->key = strdup(OPAL_PMIX_OPTIONAL); \ _info->type = OPAL_BOOL; \ _info->data.flag = true; \ opal_list_append(&(_ilist), &(_info)->super); \ diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c index 78cf662e68b..95c249b1761 100644 --- a/orte/mca/ess/singleton/ess_singleton_module.c +++ b/orte/mca/ess/singleton/ess_singleton_module.c @@ -249,7 +249,7 @@ static int rte_init(void) /* get our app number from PMI - ok if not found */ - OPAL_MODEX_RECV_VALUE(ret, OPAL_PMIX_APPNUM, + OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, OPAL_PMIX_APPNUM, ORTE_PROC_MY_NAME, &u32ptr, OPAL_UINT32); if (OPAL_SUCCESS == ret) { orte_process_info.app_num = u32;