Skip to content

v4.1.x: Fix a couple managed allocation issues. #8355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsquyres merged 2 commits into from
Jan 11, 2021
Merged

v4.1.x: Fix a couple managed allocation issues. #8355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b350e8
Make a managed allocation filter a hostfile/hostlist.
awlauria Jan 7, 2021
1678b69
Fix bug where orte under a managed allocation does not honor -host.
awlauria Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions orte/mca/rmaps/base/rmaps_base_support_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,15 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr

/* if this is NOT a managed allocation, then we use the nodes
* that were specified for this app - there is no need to collect
* all available nodes and "filter" them
* all available nodes and "filter" them.
*
* However, if it is a managed allocation AND the hostfile or the hostlist was
* provided, those take precedence, so process them and filter as we normally do.
*/
if (!orte_managed_allocation) {
if ( !orte_managed_allocation ||
(orte_managed_allocation &&
(orte_get_attribute(&app->attributes, ORTE_APP_DASH_HOST, (void**)&hosts, OPAL_STRING) ||
orte_get_attribute(&app->attributes, ORTE_APP_HOSTFILE, (void**)&hosts, OPAL_STRING)))) {
OBJ_CONSTRUCT(&nodes, opal_list_t);
/* if the app provided a dash-host, and we are not treating
* them as requested or "soft" locations, then use those nodes
Expand Down
25 changes: 24 additions & 1 deletion orte/util/dash_host/dash_host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,30 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
}
}

rc = ORTE_SUCCESS;
// Managed allocation: Update the node pool slots
// with what was asked for in the host list.
if(orte_managed_allocation) {
orte_node_t *node_from_pool = NULL;
for (i = 0; i < orte_node_pool->size; i++) {
if (NULL == (node_from_pool = (orte_node_t*)opal_pointer_array_get_item(orte_node_pool, i))) {
continue;
}
for (itm = opal_list_get_first(nodes);
itm != opal_list_get_end(nodes);
itm = opal_list_get_next(itm)) {
node = (orte_node_t*) itm;
if (0 == strcmp(node_from_pool->name, node->name)) {
if(node->slots < node_from_pool -> slots) {
node_from_pool->slots = node->slots;
}
break;
}
// There's no need to check that this host exists in the pool. That
// should have already been checked at this point.
}
}
}
rc = ORTE_SUCCESS;

cleanup:
if (NULL != mapped_nodes) {
Expand Down