From 247ba7e90d5e5c95292fce80f07d2c6fc5508202 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 15 Jul 2009 11:28:58 +0000 Subject: [PATCH] Use the base function to claim a slot when fault groups are not defined This commit was SVN r21681. --- orte/mca/rmaps/resilient/rmaps_resilient.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/orte/mca/rmaps/resilient/rmaps_resilient.c b/orte/mca/rmaps/resilient/rmaps_resilient.c index 49220e7994..38749ebbda 100644 --- a/orte/mca/rmaps/resilient/rmaps_resilient.c +++ b/orte/mca/rmaps/resilient/rmaps_resilient.c @@ -273,11 +273,16 @@ static int orte_rmaps_resilient_map(orte_job_t *jdata) ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nd->name)); /* put proc on the found node */ - OBJ_RETAIN(nd); /* required to maintain bookkeeping */ - proc->node = nd; - opal_pointer_array_add(nd->procs, (void*)proc); - OBJ_RETAIN(proc); /* required to maintain bookkeeping */ - nd->num_procs++; + if (ORTE_SUCCESS != (rc = orte_rmaps_base_claim_slot(jdata, nd, proc->name.vpid, NULL, proc->app_idx, + NULL, jdata->map->oversubscribe, false))) { + /** if the code is ORTE_ERR_NODE_FULLY_USED, then we know this + * really isn't an error + */ + if (ORTE_ERR_NODE_FULLY_USED != rc) { + ORTE_ERROR_LOG(rc); + goto error; + } + } /* flag the proc state as non-launched so we'll know to launch it */ proc->state = ORTE_PROC_STATE_INIT; /* update the node and local ranks so static ports can