1
1

don't allocate to nodes that aren't valid (e.g. front end) - ignore them

rather then giving an error message

This commit was SVN r6358.
Этот коммит содержится в:
Tim Woodall 2005-07-06 17:55:01 +00:00
родитель 8e30d2e7cb
Коммит c860b92011

Просмотреть файл

@ -118,15 +118,17 @@ static int orte_ras_bjs_discover(opal_list_t* nodelist)
} }
/* validate that any user supplied nodes actually exist, etc. */ /* validate that any user supplied nodes actually exist, etc. */
for(item = opal_list_get_first(nodelist); item = opal_list_get_first(nodelist);
item != opal_list_get_end(nodelist); while(item != opal_list_get_end(nodelist)) {
item = opal_list_get_next(item)) { opal_list_item_t* next = opal_list_get_next(item);
int node_num; int node_num;
orte_ras_base_node_t* node = (orte_ras_base_node_t*)item; orte_ras_base_node_t* node = (orte_ras_base_node_t*)item;
if(ORTE_SUCCESS != orte_ras_bjs_node_resolve(node->node_name, &node_num)) { if(ORTE_SUCCESS != orte_ras_bjs_node_resolve(node->node_name, &node_num)) {
opal_output(0, "error: a specified node (%s) is invalid.\n", node->node_name); opal_list_remove_item(nodelist,item);
return ORTE_NODE_ERROR; OBJ_DESTRUCT(item);
item = next;
continue;
} }
if(orte_ras_bjs_node_state(node_num) != ORTE_NODE_STATE_UP) { if(orte_ras_bjs_node_state(node_num) != ORTE_NODE_STATE_UP) {
@ -147,6 +149,7 @@ static int orte_ras_bjs_discover(opal_list_t* nodelist)
node->node_slots_max = 0; node->node_slots_max = 0;
node->node_slots = orte_ras_bjs_node_slots(node->node_name); node->node_slots = orte_ras_bjs_node_slots(node->node_name);
} }
item = next;
} }
/* parse the node list and check node status/access */ /* parse the node list and check node status/access */