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

fix for some places looking at only a uint16_t where it is really uint32_t

parent 04549a47
No related branches found
No related tags found
No related merge requests found
...@@ -497,7 +497,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data) ...@@ -497,7 +497,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
SELECT_DATA_MAX_PROCS, SELECT_DATA_MAX_PROCS,
&tmp); &tmp);
if(job_desc->min_nodes == (uint16_t) NO_VAL) if(job_desc->min_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS; return SLURM_SUCCESS;
select_g_get_jobinfo(job_desc->select_jobinfo, select_g_get_jobinfo(job_desc->select_jobinfo,
SELECT_DATA_GEOMETRY, &req_geometry); SELECT_DATA_GEOMETRY, &req_geometry);
...@@ -554,7 +554,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data) ...@@ -554,7 +554,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
job_desc->min_nodes = 1; job_desc->min_nodes = 1;
} }
if(job_desc->max_nodes == (uint16_t) NO_VAL) if(job_desc->max_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS; return SLURM_SUCCESS;
if(job_desc->max_nodes > bluegene_bp_node_cnt) { if(job_desc->max_nodes > bluegene_bp_node_cnt) {
......
...@@ -1671,7 +1671,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run, ...@@ -1671,7 +1671,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
select_g_get_jobinfo(job_desc->select_jobinfo, select_g_get_jobinfo(job_desc->select_jobinfo,
SELECT_DATA_MAX_PROCS, &max_procs); SELECT_DATA_MAX_PROCS, &max_procs);
debug2("after alteration asking for nodes %u-%u procs %u-%d", debug2("after alteration asking for nodes %u-%u procs %u-%u",
job_desc->min_nodes, job_desc->max_nodes, job_desc->min_nodes, job_desc->max_nodes,
job_desc->num_procs, max_procs); job_desc->num_procs, max_procs);
...@@ -1808,7 +1808,8 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run, ...@@ -1808,7 +1808,8 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
} }
if (job_desc->max_nodes && if (job_desc->max_nodes &&
(job_desc->max_nodes < job_desc->min_nodes)) { (job_desc->max_nodes < job_desc->min_nodes)) {
info("Job's max_nodes < min_nodes"); info("Job's max_nodes(%u) < min_nodes(%u)",
job_desc->max_nodes, job_desc->min_nodes);
error_code = ESLURM_TOO_MANY_REQUESTED_NODES; error_code = ESLURM_TOO_MANY_REQUESTED_NODES;
goto cleanup; goto cleanup;
} }
......
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