From: Alastair McKinstry <mckinstry@debian.org>
Date: Wed, 8 Sep 2021 13:07:52 +0000 (+0100)
Subject: Workaround for issue running on remote host
X-Git-Tag: archive/raspbian/4.1.1-5+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3fe250fad46104c78379ff5e9b5558e211c28a7;p=openmpi.git

Workaround for issue running on remote host

Last-Updated: 2021-05-13
Forwarded: not-needed


Gbp-Pq: Name pr8596.patch
---

diff --git a/opal/mca/pmix/pmix3x/pmix3x.c b/opal/mca/pmix/pmix3x/pmix3x.c
index 90670f6a..01d63250 100644
--- a/opal/mca/pmix/pmix3x/pmix3x.c
+++ b/opal/mca/pmix/pmix3x/pmix3x.c
@@ -1186,6 +1186,14 @@ int pmix3x_value_unload(opal_value_t *kv,
         kv->type = OPAL_PTR;
         kv->data.ptr = (void*)lt;
         for (n=0; n < v->data.darray->size; n++) {
+            if (PMIX_INFO == v->data.darray->type) {
+                pmix_info_t *iptr = (pmix_info_t*)v->data.darray->array;
+                if (0 == strcmp("pmix.topo2", iptr[n].key)) {
+                    /* we do not know (yet) how to convert the pmix.topo2 key from PMIx 4.0.0
+                     * but since we are not going to use it, simply ignore it and move on */
+                    continue;
+                }
+            }
             ival = OBJ_NEW(opal_value_t);
             opal_list_append(lt, &ival->super);
             /* handle the various types */