Skip to content

Commit c7867ff

Browse files
committed
opal/runtime: fix teardown ordering
This commit fixes the ordering of the teardown for opal_finalize_util. The installdirs and if frameworks need to come down before the MCA system. Fixes #6259 Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
1 parent 1c5f97b commit c7867ff

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

opal/runtime/opal_init.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* All Rights reserved.
2323
* Copyright (c) 2018 Mellanox Technologies, Inc.
2424
* All rights reserved.
25-
* Copyright (c) 2018 Triad National Security, LLC. All rights
25+
* Copyright (c) 2018-2019 Triad National Security, LLC. All rights
2626
* reserved.
2727
* $COPYRIGHT$
2828
*
@@ -388,9 +388,6 @@ opal_init_util(int* pargc, char*** pargv)
388388

389389
opal_init_called = true;
390390

391-
/* register for */
392-
opal_finalize_register_cleanup_arg (mca_base_framework_close_list, opal_init_util_frameworks);
393-
394391
/* set the nodename right away so anyone who needs it has it. Note
395392
* that we don't bother with fqdn and prefix issues here - we let
396393
* the RTE later replace this with a modified name if the user
@@ -511,6 +508,9 @@ opal_init_util(int* pargc, char*** pargv)
511508
return ret;
512509
}
513510

511+
/* register for */
512+
opal_finalize_register_cleanup_arg (mca_base_framework_close_list, opal_init_util_frameworks);
513+
514514
OPAL_TIMING_ENV_NEXT(otmng, "opal_if_init");
515515

516516
return OPAL_SUCCESS;

0 commit comments

Comments
 (0)