Skip to content
Snippets Groups Projects
Commit aca141d5 authored by Danny Auble's avatar Danny Auble
Browse files

fix to handle user only sending in a proc count instead of a node count on bluegene

parent abe2038c
No related branches found
No related tags found
No related merge requests found
...@@ -191,7 +191,11 @@ extern int block_ready(struct job_record *job_ptr) ...@@ -191,7 +191,11 @@ extern int block_ready(struct job_record *job_ptr)
else else
rc = READY_JOB_ERROR; /* try again */ rc = READY_JOB_ERROR; /* try again */
} else { } else {
error("block_ready: block %s not in bg_lists->main.", /* This means the block has been removed and
is no longer valid. This could happen
often during an epilog on a busy system.
*/
debug2("block_ready: block %s not in bg_lists->main.",
block_id); block_id);
rc = READY_JOB_FATAL; /* fatal error */ rc = READY_JOB_FATAL; /* fatal error */
} }
......
...@@ -1123,6 +1123,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data) ...@@ -1123,6 +1123,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
if(job_desc->min_nodes == (uint32_t) NO_VAL) if(job_desc->min_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS; return SLURM_SUCCESS;
get_select_jobinfo(job_desc->select_jobinfo, get_select_jobinfo(job_desc->select_jobinfo,
SELECT_JOBDATA_GEOMETRY, &req_geometry); SELECT_JOBDATA_GEOMETRY, &req_geometry);
...@@ -1135,7 +1136,14 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data) ...@@ -1135,7 +1136,14 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
job_desc->min_nodes *= bg_conf->bp_node_cnt; job_desc->min_nodes *= bg_conf->bp_node_cnt;
job_desc->max_nodes = job_desc->min_nodes; job_desc->max_nodes = job_desc->min_nodes;
} }
/* make sure if the user only specified num_procs to
set min_nodes correctly
*/
if(job_desc->num_procs > job_desc->min_nodes)
job_desc->min_nodes =
job_desc->num_procs / bg_conf->proc_ratio;
/* initialize num_procs to the min_nodes */ /* initialize num_procs to the min_nodes */
job_desc->num_procs = job_desc->min_nodes * bg_conf->proc_ratio; job_desc->num_procs = job_desc->min_nodes * bg_conf->proc_ratio;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment