Skip to content
Snippets Groups Projects
Commit 6253538c authored by jette's avatar jette
Browse files

Merge branch 'slurm-2.4' into slurm-2.5

parents 7578099f 29c2661a
No related branches found
No related tags found
No related merge requests found
...@@ -715,6 +715,8 @@ documents those changes that are of interest to users and admins. ...@@ -715,6 +715,8 @@ documents those changes that are of interest to users and admins.
a reconfiguration, the node's bitmap was not cleared resulting in an a reconfiguration, the node's bitmap was not cleared resulting in an
underflow upon job termination or removal from scheduling matrix by the underflow upon job termination or removal from scheduling matrix by the
backfill scheduler. backfill scheduler.
-- Fix race condition in job dependency logic which can result in invalid
memory reference.
* Changes in SLURM 2.3.5 * Changes in SLURM 2.3.5
======================== ========================
......
...@@ -1653,6 +1653,9 @@ static bool _scan_depend(List dependency_list, uint32_t job_id) ...@@ -1653,6 +1653,9 @@ static bool _scan_depend(List dependency_list, uint32_t job_id)
continue; continue;
if (dep_ptr->job_id == job_id) if (dep_ptr->job_id == job_id)
rc = true; rc = true;
else if ((dep_ptr->job_id != dep_ptr->job_ptr->job_id) ||
(dep_ptr->job_ptr->magic != JOB_MAGIC))
continue; /* purged job, ptr not yet cleared */
else if (dep_ptr->job_ptr->details && else if (dep_ptr->job_ptr->details &&
dep_ptr->job_ptr->details->depend_list) { dep_ptr->job_ptr->details->depend_list) {
rc = _scan_depend(dep_ptr->job_ptr->details-> rc = _scan_depend(dep_ptr->job_ptr->details->
......
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