From 2d242ab9f089cc0238f9710ca2fc8485ddc377bd Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Mon, 21 Aug 2017 16:12:32 +0200 Subject: [PATCH] hwloc/shmem: don't abort on failure to load from shmem Adopting can fail if the server-side hole isn't available on the client. We can fallback to other ways to load the topology. Signed-off-by: Brice Goglin --- opal/mca/hwloc/base/hwloc_base_util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c index 481a7859af..da8bebb19d 100644 --- a/opal/mca/hwloc/base/hwloc_base_util.c +++ b/opal/mca/hwloc/base/hwloc_base_util.c @@ -326,13 +326,13 @@ int opal_hwloc_base_get_topology(void) fclose(file); } } - OPAL_ERROR_LOG(OPAL_ERR_FILE_READ_FAILURE); - return OPAL_ERR_FILE_READ_FAILURE; + /* failed to adopt from shmem, fallback to other ways to get the topology */ + } else { + opal_output_verbose(2, opal_hwloc_base_framework.framework_output, + "hwloc:base: topology in shared memory"); + topo_in_shmem = true; + return OPAL_SUCCESS; } - opal_output_verbose(2, opal_hwloc_base_framework.framework_output, - "hwloc:base: topology in shared memory"); - topo_in_shmem = true; - return OPAL_SUCCESS; } #endif /* if that isn't available, then try to retrieve