Merge pull request #12297 from iyastreb/oshmem/mca/ucx/fix-double-cleanup

ompi/oshmem/spml/ucx: Fix cleanup when disconnected: avoid double free

Author: yosefe

oshmem/mca/spml/ucx/spml_ucx.h

@@ -43,6 +43,7 @@ BEGIN_C_DECLS
 
 #define SPML_UCX_ASSERT  MCA_COMMON_UCX_ASSERT
 #define SPML_UCX_ERROR   MCA_COMMON_UCX_ERROR
+#define SPML_UCX_WARN    MCA_COMMON_UCX_WARN
 #define SPML_UCX_VERBOSE MCA_COMMON_UCX_VERBOSE
 #define SPML_UCX_TRANSP_IDX 0
 #define SPML_UCX_TRANSP_CNT 1

oshmem/mca/spml/ucx/spml_ucx_component.c

@@ -458,7 +458,8 @@ static void mca_spml_ucx_ctx_fini(mca_spml_ucx_ctx_t *ctx)
 
 static int mca_spml_ucx_component_fini(void)
 {
-    int fenced = 0, i;
+    volatile int fenced = 0;
+    int i;
     int ret = OSHMEM_SUCCESS;
     mca_spml_ucx_ctx_t *ctx;
 
@@ -491,8 +492,10 @@ static int mca_spml_ucx_component_fini(void)
 
 
     ret = opal_common_ucx_mca_pmix_fence_nb(&fenced);
-    if (OPAL_SUCCESS != ret) {
-        return ret;
+    if (ret != PMIX_SUCCESS) {
+        SPML_UCX_WARN("pmix fence failed: %s", PMIx_Error_string(ret));
+        /* In case of pmix fence failure just continue cleanup */
+        fenced = 1;
     }
 
     while (!fenced) {