1
1

Print a better error message when srun isn't found in the path. Ensure we don't segfault if -host specifies a node not included in the allocation

Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2017-06-09 07:46:47 -07:00
родитель 3d0fc29b4b
Коммит 1f0f03b45b
3 изменённых файлов: 13 добавлений и 6 удалений

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

@ -2151,11 +2151,13 @@ int orte_plm_base_setup_virtual_machine(orte_job_t *jdata)
} }
/* ensure we are not on the list */ /* ensure we are not on the list */
item = opal_list_get_first(&nodes); if (0 < opal_list_get_size(&nodes)) {
node = (orte_node_t*)item; item = opal_list_get_first(&nodes);
if (0 == node->index) { node = (orte_node_t*)item;
opal_list_remove_item(&nodes, item); if (0 == node->index) {
OBJ_RELEASE(item); opal_list_remove_item(&nodes, item);
OBJ_RELEASE(item);
}
} }
/* if we didn't get anything, then we are the only node in the /* if we didn't get anything, then we are the only node in the

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

@ -49,3 +49,7 @@ are running.
Please consult with your system administrator about obtaining Please consult with your system administrator about obtaining
such support. such support.
[no-srun]
The SLURM process starter for OpenMPI was unable to locate a
usable "srun" command in its path. Please check your path
and try again.

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

@ -587,7 +587,8 @@ static int plm_slurm_start_proc(int argc, char **argv, char **env,
orte_proc_t *dummy; orte_proc_t *dummy;
if (NULL == exec_argv) { if (NULL == exec_argv) {
return ORTE_ERR_NOT_FOUND; orte_show_help("help-plm-slurm.txt", "no-srun", true);
return ORTE_ERR_SILENT;
} }
srun_pid = fork(); srun_pid = fork();