Skip to content
Snippets Groups Projects
Commit cc242de3 authored by Morris Jette's avatar Morris Jette
Browse files

unitialized task binding variable

Fix for uninitialized variable in task binding logic, could leave tasks
    with fewer CPUs than intended.
bug 2766
parent 96ef2a9b
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,8 @@ documents those changes that are of interest to users and administrators. ...@@ -16,6 +16,8 @@ documents those changes that are of interest to users and administrators.
-- Cray - Fix node list parsing in capmc_suspend/resume programs. -- Cray - Fix node list parsing in capmc_suspend/resume programs.
-- Fix sbatch #BSUB parsing for -W and -M options. -- Fix sbatch #BSUB parsing for -W and -M options.
-- Fix GRES task layout bug that could cause slurmctld to abort. -- Fix GRES task layout bug that could cause slurmctld to abort.
-- Fix for uninitialized variable in task binding logic, could leave tasks
with fewer CPUs than intended.
* Changes in Slurm 16.05.0rc2 * Changes in Slurm 16.05.0rc2
============================= =============================
......
...@@ -329,8 +329,10 @@ void reset_cpuset(cpu_set_t *new_mask, cpu_set_t *cur_mask) ...@@ -329,8 +329,10 @@ void reset_cpuset(cpu_set_t *new_mask, cpu_set_t *cur_mask)
cpu_set_t full_mask, newer_mask; cpu_set_t full_mask, newer_mask;
int cur_offset, new_offset = 0, last_set = -1; int cur_offset, new_offset = 0, last_set = -1;
if (!_is_power_cpu()) if (!_is_power_cpu()) {
CPU_OR(new_mask, new_mask, cur_mask);
return; return;
}
if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) { if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) {
/* Try to get full CPU mask from process init */ /* Try to get full CPU mask from process init */
......
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