diff --git a/NEWS b/NEWS index 70f42f568f97977a134dddf972ecaf6dcd03c275..02d908ea866d9c670ba8bb57cfb21f47b7a4e99e 100644 --- a/NEWS +++ b/NEWS @@ -34,6 +34,10 @@ documents those changes that are of interest to users and admins. * Changes in SLURM 1.1.9 ======================== + -- BLUEGENE - fix to handle a NO_VAL sent in as num procs in the job + description. + -- Fix bug in slurmstepd code for parsing --multi-prog command script. + Parser was failing for commands with no arguments. * Changes in SLURM 1.1.8 ======================== diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c index 0777979884538d351f5e6e61b416ed137d2e3dc3..aeeb3c4b52d13542e3f71cddba93fefece69c3e5 100644 --- a/src/plugins/select/bluegene/plugin/select_bluegene.c +++ b/src/plugins/select/bluegene/plugin/select_bluegene.c @@ -470,10 +470,12 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data) job_desc->max_nodes = job_desc->min_nodes; } - if(job_desc->min_nodes < job_desc->num_procs) - job_desc->min_nodes = job_desc->num_procs; - if(job_desc->max_nodes < job_desc->num_procs) - job_desc->max_nodes = job_desc->num_procs; + if(job_desc->num_procs != NO_VAL) { + if(job_desc->min_nodes < job_desc->num_procs) + job_desc->min_nodes = job_desc->num_procs; + if(job_desc->max_nodes < job_desc->num_procs) + job_desc->max_nodes = job_desc->num_procs; + } /* See if min_nodes is greater than one base partition */ if(job_desc->min_nodes > bluegene_bp_node_cnt) { /* diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c index 1c455e12d41d2688159556a3286fe675f252f99c..8095537926e666c22ae2b333564537ae0f047d0a 100644 --- a/src/slurmctld/job_mgr.c +++ b/src/slurmctld/job_mgr.c @@ -2489,7 +2489,7 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate, return ESLURM_USER_ID_MISSING; } if ( job_desc_msg->group_id == NO_VAL ) { - verbose("_validate_job_desc: job failed to specify group"); + debug("_validate_job_desc: job failed to specify group"); job_desc_msg->group_id = 0; /* uses user default */ } if ((job_desc_msg->name) &&