Skip to content

Commit

Permalink
Fix rare segfault when shutting down slurmctld and still sending data to
Browse files Browse the repository at this point in the history
the database.
  • Loading branch information
dannyauble committed Mar 8, 2017
1 parent a7699ba commit 44eb7c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions NEWS
Expand Up @@ -16,6 +16,8 @@ documents those changes that are of interest to users and administrators.
allocation of "20,22" must be expressed as "20\n22".
-- Fix pam_slurm_adopt.so (and other external code linked against libslurm)
by exporting adding s_p_get_uint64 to slurm_xlator.h.
-- Fix rare segfault when shutting down slurmctld and still sending data to
the database.

* Changes in Slurm 17.02.1-2
============================
Expand Down
3 changes: 3 additions & 0 deletions src/common/slurmdbd_defs.c
Expand Up @@ -419,6 +419,9 @@ static void _open_slurmdbd_conn(bool need_db)
/* clear errno (checked after this for errors) */
errno = 0;
return;
} else if (slurmdbd_shutdown) {
debug("Request to open slurmdbd_conn after shutdown, denied.");
return;
}

slurm_persist_conn_close(slurmdbd_conn);
Expand Down

0 comments on commit 44eb7c5

Please sign in to comment.