From 62c2ff7ee7252023dae98b69130c30f6131f9235 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 1 Aug 2012 19:49:19 +0000 Subject: [PATCH] It's actually ''not'' an error to exit if all routes and children are gone. So exit with 0, not ORTE_ERROR_DEFAULT_EXIT_CODE (which is 1). This fixes a race condition in the rsh launcher upon termination, where ORTE would sometimes think that a daemon failed to launch. This commit was SVN r26935. --- orte/mca/errmgr/default_orted/errmgr_default_orted.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/orte/mca/errmgr/default_orted/errmgr_default_orted.c b/orte/mca/errmgr/default_orted/errmgr_default_orted.c index 7c44337bec..2d8a2e6e4e 100644 --- a/orte/mca/errmgr/default_orted/errmgr_default_orted.c +++ b/orte/mca/errmgr/default_orted/errmgr_default_orted.c @@ -282,12 +282,13 @@ static void proc_errors(int fd, short args, void *cbdata) } } } - /* if all my routes and children are gone, then terminate ourselves */ + /* if all my routes and children are gone, then terminate + ourselves nicely (i.e., this is a normal termination) */ if (0 == orte_routed.num_routes()) { OPAL_OUTPUT_VERBOSE((2, orte_errmgr_base.output, "%s errmgr:default:orted all routes gone - exiting", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); - ORTE_TERMINATE(ORTE_ERROR_DEFAULT_EXIT_CODE); + ORTE_TERMINATE(0); } else { OPAL_OUTPUT_VERBOSE((2, orte_errmgr_base.output, "%s errmgr:default:orted not exiting, num_routes() == %d",