1
1

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.
Этот коммит содержится в:
Ralph Castain 2014-01-08 22:35:48 +00:00
родитель 9d41632eba
Коммит 80497d73cf
3 изменённых файлов: 3 добавлений и 13 удалений

Просмотреть файл

@ -728,6 +728,8 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender,
} }
daemon->state = ORTE_PROC_STATE_RUNNING; daemon->state = ORTE_PROC_STATE_RUNNING;
daemon->rml_uri = rml_uri; daemon->rml_uri = rml_uri;
/* record that this daemon is alive */
daemon->alive = true;
/* unpack the node name */ /* unpack the node name */
idx = 1; idx = 1;
@ -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, /* pass along any cmd line MCA params provided to mpirun,
* being sure to "purge" any that would cause problems * being sure to "purge" any that would cause problems
* on backend nodes and ignoring all duplicates * on backend nodes and ignoring all duplicates

Просмотреть файл

@ -202,8 +202,6 @@ opal_byte_object_t orte_pidmap;
/* user debugger */ /* user debugger */
char *orte_base_user_debugger = NULL; char *orte_base_user_debugger = NULL;
char *orte_selected_oob_component = NULL;
int orte_debug_output = -1; int orte_debug_output = -1;
bool orte_debug_daemons_flag = false; bool orte_debug_daemons_flag = false;
bool orte_xml_output = false; bool orte_xml_output = false;

Просмотреть файл

@ -730,9 +730,6 @@ ORTE_DECLSPEC extern bool orte_map_stddiag_to_stderr;
/* maximum size of virtual machine - used to subdivide allocation */ /* maximum size of virtual machine - used to subdivide allocation */
ORTE_DECLSPEC extern int orte_max_vm_size; 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 */ /* 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_nidmap;
ORTE_DECLSPEC extern opal_byte_object_t orte_pidmap; ORTE_DECLSPEC extern opal_byte_object_t orte_pidmap;