From 0a67bcb653e6721c190fe1c4f1670b85d602b34a Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Sat, 6 Jun 2009 15:44:00 +0000
Subject: [PATCH] Minor cleanups

This commit was SVN r21387.
---
 orte/mca/ess/cm/ess_cm_module.c            | 13 +------------
 orte/mca/rmaps/resilient/rmaps_resilient.c | 13 ++++---------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/orte/mca/ess/cm/ess_cm_module.c b/orte/mca/ess/cm/ess_cm_module.c
index 33e33875b3..9c57243803 100644
--- a/orte/mca/ess/cm/ess_cm_module.c
+++ b/orte/mca/ess/cm/ess_cm_module.c
@@ -374,18 +374,6 @@ static int rte_init(void)
         goto error;
     }
     
-    /* setup I/O forwarding system - must come after we init routes */
-    if (ORTE_SUCCESS != (ret = orte_iof_base_open())) {
-        ORTE_ERROR_LOG(ret);
-        error = "orte_iof_base_open";
-        goto error;
-    }
-    if (ORTE_SUCCESS != (ret = orte_iof_base_select())) {
-        ORTE_ERROR_LOG(ret);
-        error = "orte_iof_base_select";
-        goto error;
-    }
-    
     /* setup the notifier system */
     if (ORTE_SUCCESS != (ret = orte_notifier_base_open())) {
         ORTE_ERROR_LOG(ret);
@@ -424,6 +412,7 @@ static int rte_finalize(void)
     /* finalize selected modules so they can de-register
      * any receives
      */
+    orte_ras_base_close();
     orte_rmaps_base_close();
     orte_plm_base_close();
     orte_errmgr_base_close();
diff --git a/orte/mca/rmaps/resilient/rmaps_resilient.c b/orte/mca/rmaps/resilient/rmaps_resilient.c
index b7b5590d6d..0c43de784f 100644
--- a/orte/mca/rmaps/resilient/rmaps_resilient.c
+++ b/orte/mca/rmaps/resilient/rmaps_resilient.c
@@ -411,14 +411,15 @@ static int orte_rmaps_resilient_map(orte_job_t *jdata)
                 }
             }
             /* if no ftgrps are available, then just map it on the lightest loaded
-             * node in the current map
+             * node in the current map, avoiding the current node if possible
              */
             if (NULL == target) {
-                nd = NULL;
+                nd = oldnode;  /* put it back where it was if nothing else is found */
                 totprocs = 1000000;
                 map = jdata->map;
                 for (k=0; k < map->nodes->size; k++) {
-                    if (NULL == (node = opal_pointer_array_get_item(map->nodes, k))) {
+                    if (NULL == (node = opal_pointer_array_get_item(map->nodes, k)) ||
+                        node == oldnode) {
                         continue;
                     }
                     if (node->num_procs < totprocs) {
@@ -426,12 +427,6 @@ static int orte_rmaps_resilient_map(orte_job_t *jdata)
                         totprocs = node->num_procs;
                     }
                 }
-                if (NULL == nd) {
-                    /* we are hosed - abort */
-                    orte_show_help("help-orte-rmaps-resilient.txt", "orte-rmaps-resilient:could-not-remap-proc",
-                                   true, ORTE_NAME_PRINT(&proc->name));
-                    return ORTE_ERROR;
-                }
                 /* put proc on the found node */
                 OBJ_RETAIN(nd);  /* required to maintain bookeeping */
                 proc->node = nd;