diff --git a/orte/mca/ras/base/ras_base_allocate.c b/orte/mca/ras/base/ras_base_allocate.c index 7c2389fe3b..bb160fae72 100644 --- a/orte/mca/ras/base/ras_base_allocate.c +++ b/orte/mca/ras/base/ras_base_allocate.c @@ -254,7 +254,6 @@ void orte_ras_base_allocate(int fd, short args, void *cbdata) /* a default hostfile was provided - parse it */ if (ORTE_SUCCESS != (rc = orte_util_add_hostfile_nodes(&nodes, orte_default_hostfile))) { - ORTE_ERROR_LOG(rc); OBJ_DESTRUCT(&nodes); ORTE_FORCED_TERMINATE(ORTE_ERROR_DEFAULT_EXIT_CODE); OBJ_RELEASE(caddy); @@ -270,7 +269,6 @@ void orte_ras_base_allocate(int fd, short args, void *cbdata) /* a rankfile was provided - parse it */ if (ORTE_SUCCESS != (rc = orte_util_add_hostfile_nodes(&nodes, orte_rankfile))) { - ORTE_ERROR_LOG(rc); OBJ_DESTRUCT(&nodes); ORTE_FORCED_TERMINATE(ORTE_ERROR_DEFAULT_EXIT_CODE); OBJ_RELEASE(caddy); @@ -290,7 +288,6 @@ void orte_ras_base_allocate(int fd, short args, void *cbdata) /* hostfile was specified - parse it and add it to the list */ if (ORTE_SUCCESS != (rc = orte_util_add_hostfile_nodes(&nodes, app->hostfile))) { - ORTE_ERROR_LOG(rc); OBJ_DESTRUCT(&nodes); /* set an error event */ ORTE_FORCED_TERMINATE(ORTE_ERROR_DEFAULT_EXIT_CODE); @@ -310,7 +307,6 @@ void orte_ras_base_allocate(int fd, short args, void *cbdata) ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); if (ORTE_SUCCESS != (rc = orte_util_add_dash_host_nodes(&nodes, app->dash_host))) { - ORTE_ERROR_LOG(rc); OBJ_DESTRUCT(&nodes); ORTE_FORCED_TERMINATE(ORTE_ERROR_DEFAULT_EXIT_CODE); OBJ_RELEASE(caddy); diff --git a/orte/util/hostfile/hostfile.c b/orte/util/hostfile/hostfile.c index 96b8c68e32..0af57a064f 100644 --- a/orte/util/hostfile/hostfile.c +++ b/orte/util/hostfile/hostfile.c @@ -336,6 +336,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, orte_show_help("help-hostfile.txt", "slots", true, cur_hostfile_name, rc); + opal_list_remove_item(updates, &node->super); OBJ_RELEASE(node); return ORTE_ERROR; } @@ -346,6 +347,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, orte_show_help("help-hostfile.txt", "slots-given", true, cur_hostfile_name, node->name); + opal_list_remove_item(updates, &node->super); OBJ_RELEASE(node); return ORTE_ERROR; } @@ -364,6 +366,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, orte_show_help("help-hostfile.txt", "max_slots", true, cur_hostfile_name, ((size_t) rc)); + opal_list_remove_item(updates, &node->super); OBJ_RELEASE(node); return ORTE_ERROR; } @@ -378,6 +381,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, true, cur_hostfile_name, node->slots, rc); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); + opal_list_remove_item(updates, &node->super); OBJ_RELEASE(node); return ORTE_ERROR; } @@ -385,11 +389,13 @@ static int hostfile_parse_line(int token, opal_list_t* updates, default: hostfile_parse_error(token); + opal_list_remove_item(updates, &node->super); OBJ_RELEASE(node); return ORTE_ERROR; } if (number_of_slots > node->slots) { ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); + opal_list_remove_item(updates, &node->super); OBJ_RELEASE(node); return ORTE_ERROR; }