Skip to content

Commit 2d242ab

Browse files
committed
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 <[email protected]>
1 parent ffd209f commit 2d242ab

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

opal/mca/hwloc/base/hwloc_base_util.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,13 @@ int opal_hwloc_base_get_topology(void)
326326
fclose(file);
327327
}
328328
}
329-
OPAL_ERROR_LOG(OPAL_ERR_FILE_READ_FAILURE);
330-
return OPAL_ERR_FILE_READ_FAILURE;
329+
/* failed to adopt from shmem, fallback to other ways to get the topology */
330+
} else {
331+
opal_output_verbose(2, opal_hwloc_base_framework.framework_output,
332+
"hwloc:base: topology in shared memory");
333+
topo_in_shmem = true;
334+
return OPAL_SUCCESS;
331335
}
332-
opal_output_verbose(2, opal_hwloc_base_framework.framework_output,
333-
"hwloc:base: topology in shared memory");
334-
topo_in_shmem = true;
335-
return OPAL_SUCCESS;
336336
}
337337
#endif
338338
/* if that isn't available, then try to retrieve

0 commit comments

Comments
 (0)