Skip to content

Commit e85b814

Browse files
authored
Merge pull request #2268 from rhc54/topic/hwl
Don't treat inability to open shmem file as fatal
2 parents aaab7ce + ba20c46 commit e85b814

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/hwloc/pmix_hwloc.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,11 @@ pmix_status_t pmix_hwloc_setup_topology(pmix_info_t *info, size_t ninfo)
280280

281281
if (0 > (fd = open(file, O_RDONLY))) {
282282
free(file);
283-
PMIX_ERROR_LOG(PMIX_ERROR);
284-
return PMIX_ERROR;
283+
/* it may be that a tool has connected to a remote
284+
* daemon, in which case the file won't be found.
285+
* Could also be some other error, but let's not
286+
* treat this as fatal */
287+
goto tryself;
285288
}
286289
free(file);
287290
rc = hwloc_shmem_topology_adopt((hwloc_topology_t *) &pmix_globals.topology.topology, fd, 0,
@@ -387,6 +390,7 @@ pmix_status_t pmix_hwloc_setup_topology(pmix_info_t *info, size_t ninfo)
387390
return rc;
388391
}
389392

393+
tryself:
390394
/* did they give us one to use? */
391395
if (NULL != topo_file) {
392396
pmix_output_verbose(2, pmix_hwloc_output,

0 commit comments

Comments
 (0)