From 80497d73cffcc2f00d3cf1e126c50cd131d38052 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 8 Jan 2014 22:35:48 +0000 Subject: [PATCH] Need to mark the daemon as alive so that exit commands are properly routed during abnormal terminations. Also, remove stale references to the "selected oob component" as we no longer require only one component be selected cmr=v1.7.4:reviewer=jsquyres This commit was SVN r30162. --- orte/mca/plm/base/plm_base_launch_support.c | 11 +++-------- orte/runtime/orte_globals.c | 2 -- orte/runtime/orte_globals.h | 3 --- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c index 4b57b3bd58..017e5c9a30 100644 --- a/orte/mca/plm/base/plm_base_launch_support.c +++ b/orte/mca/plm/base/plm_base_launch_support.c @@ -728,7 +728,9 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender, } daemon->state = ORTE_PROC_STATE_RUNNING; daemon->rml_uri = rml_uri; - + /* record that this daemon is alive */ + daemon->alive = true; + /* unpack the node name */ idx = 1; if (ORTE_SUCCESS != (rc = opal_dss.unpack(buffer, &nodename, &idx, OPAL_STRING))) { @@ -1258,13 +1260,6 @@ int orte_plm_base_orted_append_basic_args(int *argc, char ***argv, } } - if (NULL != orte_selected_oob_component) { - /* ensure we all use the same OOB component */ - opal_argv_append(argc, argv, "-mca"); - opal_argv_append(argc, argv, "oob"); - opal_argv_append(argc, argv, orte_selected_oob_component); - } - /* pass along any cmd line MCA params provided to mpirun, * being sure to "purge" any that would cause problems * on backend nodes and ignoring all duplicates diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c index cc53926d3d..4163087c3b 100644 --- a/orte/runtime/orte_globals.c +++ b/orte/runtime/orte_globals.c @@ -202,8 +202,6 @@ opal_byte_object_t orte_pidmap; /* user debugger */ char *orte_base_user_debugger = NULL; -char *orte_selected_oob_component = NULL; - int orte_debug_output = -1; bool orte_debug_daemons_flag = false; bool orte_xml_output = false; diff --git a/orte/runtime/orte_globals.h b/orte/runtime/orte_globals.h index 43dd63718c..0c31fb3f47 100644 --- a/orte/runtime/orte_globals.h +++ b/orte/runtime/orte_globals.h @@ -730,9 +730,6 @@ ORTE_DECLSPEC extern bool orte_map_stddiag_to_stderr; /* maximum size of virtual machine - used to subdivide allocation */ ORTE_DECLSPEC extern int orte_max_vm_size; -/* record the selected oob component */ -ORTE_DECLSPEC extern char *orte_selected_oob_component; - /* global nidmap/pidmap for daemons to give to apps */ ORTE_DECLSPEC extern opal_byte_object_t orte_nidmap; ORTE_DECLSPEC extern opal_byte_object_t orte_pidmap;