Fix ntasks-per-node logic

Regression from 49826b9 Bug 15857
SchedMD · Feb 7, 2023 · 3b8302e · 3b8302e
1 parent 8ea9941
commit 3b8302e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,8 @@ documents those changes that are of interest to users and administrators.
  -- Allocate correct number of sockets when requesting gres and running with
     CR_SOCKET*.
  -- Fix handling of --prefer for job arrays.
+ -- Fix regression in 22.05.5 that causes some jobs that request
+    --ntasks-per-node to be incorrectly rejected.
 
 * Changes in Slurm 22.05.8
 ==========================

diff --git a/src/plugins/select/cons_tres/job_test.c b/src/plugins/select/cons_tres/job_test.c
@@ -3176,6 +3176,7 @@ extern int choose_nodes(job_record_t *job_ptr, bitstr_t *node_map,
 	}
 
 	if (job_ptr->details->num_tasks &&
+	    !(job_ptr->details->ntasks_per_node) &&
 	    (max_nodes > job_ptr->details->num_tasks))
 		max_nodes = MAX(job_ptr->details->num_tasks, min_nodes);