From a526afae92caba7d7d95f8616709be7ec839f79e Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Fri, 18 May 2012 23:37:40 +0000
Subject: [PATCH] Ensure we always cleanup local procs, no matter how we
 exited.

This commit was SVN r26454.
---
 orte/orted/orted_main.c      | 3 +++
 orte/tools/orterun/orterun.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c
index 4a2df98302..f27a2500a3 100644
--- a/orte/orted/orted_main.c
+++ b/orte/orted/orted_main.c
@@ -729,6 +729,9 @@ int orte_daemon(int argc, char *argv[])
         opal_event_loop(orte_event_base, OPAL_EVLOOP_ONCE);
     }
 
+    /* ensure all local procs are dead */
+    orte_odls.kill_local_procs(NULL);
+
  DONE:
     /* update the exit status, in case it wasn't done */
     ORTE_UPDATE_EXIT_STATUS(orte_exit_status);
diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
index c258a6b1b8..672724e554 100644
--- a/orte/tools/orterun/orterun.c
+++ b/orte/tools/orterun/orterun.c
@@ -930,6 +930,9 @@ int orterun(int argc, char *argv[])
         opal_event_loop(orte_event_base, OPAL_EVLOOP_ONCE);
     }
 
+    /* ensure all local procs are dead */
+    orte_odls.kill_local_procs(NULL);
+
  DONE:
     /* cleanup and leave */
     orte_finalize();