Skip to content

Commit 230bbc5

Browse files
committed
plm base: make sure to assign "node" early enough
Make sure to assign "node" before using it in ORTE_FLAG_SET. Signed-off-by: Jeff Squyres <[email protected]>
1 parent e7323fd commit 230bbc5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

orte/mca/plm/base/plm_base_launch_support.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
12-
* Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved.
12+
* Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2009 Institut National de Recherche en Informatique
1414
* et Automatique. All rights reserved.
1515
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
@@ -1053,6 +1053,8 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender,
10531053
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
10541054
ORTE_NAME_PRINT(&daemon->name), nodename));
10551055

1056+
node = daemon->node;
1057+
10561058
/* look this node up, if necessary */
10571059
if (!orte_plm_globals.daemon_nodes_assigned_at_launch) {
10581060
OPAL_OUTPUT_VERBOSE((5, orte_plm_base_framework.framework_output,
@@ -1067,7 +1069,6 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender,
10671069
ORTE_FLAG_SET(node, ORTE_NODE_FLAG_LOC_VERIFIED);
10681070
}
10691071

1070-
node = daemon->node;
10711072
if (NULL == node) {
10721073
/* this shouldn't happen - it indicates an error in the
10731074
* prior node matching logic, so report it and error out

0 commit comments

Comments
 (0)