Ensure the orted kills *all* local procs when exiting. Add a little clarity to some of the debugging output
This commit was SVN r12615.
Этот коммит содержится в:
родитель
c1813e5c5a
Коммит
5ddcb8a652
@ -389,6 +389,9 @@ int orte_odls_default_kill_local_procs(orte_jobid_t job, bool set_state)
|
|||||||
|
|
||||||
OBJ_CONSTRUCT(&procs_killed, opal_list_t);
|
OBJ_CONSTRUCT(&procs_killed, opal_list_t);
|
||||||
|
|
||||||
|
opal_output(orte_odls_globals.output, "[%ld,%ld,%ld] odls_kill_local_proc: working on job %ld",
|
||||||
|
ORTE_NAME_ARGS(ORTE_PROC_MY_NAME), (long)job);
|
||||||
|
|
||||||
/* since we are going to be working with the global list of
|
/* since we are going to be working with the global list of
|
||||||
* children, we need to protect that list from modification
|
* children, we need to protect that list from modification
|
||||||
* by other threads
|
* by other threads
|
||||||
@ -400,10 +403,15 @@ int orte_odls_default_kill_local_procs(orte_jobid_t job, bool set_state)
|
|||||||
item = opal_list_get_next(item)) {
|
item = opal_list_get_next(item)) {
|
||||||
child = (orte_odls_child_t*)item;
|
child = (orte_odls_child_t*)item;
|
||||||
|
|
||||||
|
opal_output(orte_odls_globals.output, "[%ld,%ld,%ld] odls_kill_local_proc: checking child process [%ld,%ld,%ld]",
|
||||||
|
ORTE_NAME_ARGS(ORTE_PROC_MY_NAME), ORTE_NAME_ARGS(child->name));
|
||||||
|
|
||||||
/* is this process alive? if not, then nothing for us
|
/* is this process alive? if not, then nothing for us
|
||||||
* to do to it
|
* to do to it
|
||||||
*/
|
*/
|
||||||
if (!child->alive) {
|
if (!child->alive) {
|
||||||
|
opal_output(orte_odls_globals.output, "[%ld,%ld,%ld] odls_kill_local_proc: child is not alive",
|
||||||
|
ORTE_NAME_ARGS(ORTE_PROC_MY_NAME));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -477,7 +477,7 @@ int main(int argc, char *argv[])
|
|||||||
/* make sure our local procs are dead - but don't update their state
|
/* make sure our local procs are dead - but don't update their state
|
||||||
* on the HNP as this may be redundant
|
* on the HNP as this may be redundant
|
||||||
*/
|
*/
|
||||||
orte_odls.kill_local_procs(orted_globals.bootproxy, false);
|
orte_odls.kill_local_procs(ORTE_JOBID_WILDCARD, false);
|
||||||
|
|
||||||
/* cleanup their session directory */
|
/* cleanup their session directory */
|
||||||
orte_session_dir_cleanup(orted_globals.bootproxy);
|
orte_session_dir_cleanup(orted_globals.bootproxy);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user