Skip to content
Snippets Groups Projects
Commit 96528fa6 authored by Moe Jette's avatar Moe Jette
Browse files

Fix bug in HAVE_FRONT_END support for cluster emulation.

parent 1e8fef1c
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,7 @@ documents those changes that are of interest to users and admins. ...@@ -8,6 +8,7 @@ documents those changes that are of interest to users and admins.
-- Added some infrastructure for job suspend/resume (scontrol, api, and -- Added some infrastructure for job suspend/resume (scontrol, api, and
slurmctld stub). slurmctld stub).
-- Set job's num_procs to the actual processor count allocated to the job. -- Set job's num_procs to the actual processor count allocated to the job.
-- Fix bug in HAVE_FRONT_END support for cluster emulation.
* Changes in SLURM 0.7.0-pre6 * Changes in SLURM 0.7.0-pre6
============================= =============================
......
...@@ -184,7 +184,7 @@ extern slurm_step_layout_t *step_layout_create( ...@@ -184,7 +184,7 @@ extern slurm_step_layout_t *step_layout_create(
step_layout->cpus_per_node = alloc_resp->cpus_per_node; step_layout->cpus_per_node = alloc_resp->cpus_per_node;
step_layout->cpu_count_reps = alloc_resp->cpu_count_reps; step_layout->cpu_count_reps = alloc_resp->cpu_count_reps;
#ifdef HAVE_FRONT_END /* Limited job step support */ #ifdef HAVE_FRONT_END /* Limited job step support */
/* All jobs execute through front-end on Blue Gene/L. /* All jobs execute through front-end on Blue Gene.
* Normally we would not permit execution of job steps, * Normally we would not permit execution of job steps,
* but can fake it by just allocating all tasks to * but can fake it by just allocating all tasks to
* one of the allocated nodes. */ * one of the allocated nodes. */
...@@ -208,10 +208,17 @@ extern slurm_step_layout_t *step_layout_create( ...@@ -208,10 +208,17 @@ extern slurm_step_layout_t *step_layout_create(
if(step_req) { if(step_req) {
step_layout->hl = hostlist_create(step_req->node_list); step_layout->hl = hostlist_create(step_req->node_list);
#ifdef HAVE_FRONT_END /* Limited job step support */
/* All jobs execute through front-end on Blue Gene.
* Normally we would not permit execution of job steps,
* but can fake it by just allocating all tasks to
* one of the allocated nodes. */
step_layout->num_hosts = 1;
#else
step_layout->num_hosts = hostlist_count(step_layout->hl); step_layout->num_hosts = hostlist_count(step_layout->hl);
#endif
step_layout->task_dist = step_req->task_dist; step_layout->task_dist = step_req->task_dist;
step_layout->num_tasks = step_req->num_tasks; step_layout->num_tasks = step_req->num_tasks;
} else { } else {
debug("no step_req given for step_layout_create"); debug("no step_req given for step_layout_create");
step_layout->hl = NULL; step_layout->hl = NULL;
......
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