Skip to content
Snippets Groups Projects
Commit 109999ce authored by Danny Auble's avatar Danny Auble
Browse files

Revert "Fix potential infinite loop when talking to the DBD when shutting down"

This reverts commit a662a226.
parent a662a226
No related branches found
No related tags found
No related merge requests found
......@@ -66,8 +66,6 @@ documents those changes that are of interest to users and administrators.
-- Allow AdminComment field to be changed by any Administrator.
-- Fix key words in jobcomp select.
-- MYSQL - Streamline job flush sql when doing a clean start on the slurmctld.
-- Fix potential infinite loop when talking to the DBD when shutting down
the slurmctld.
* Changes in Slurm 17.02.1-2
============================
......
......@@ -891,12 +891,11 @@ extern Buf slurm_persist_recv_msg(slurm_persist_conn_t *persist_conn)
return buffer;
endit:
/* Close it since we abandoned it. If the connection does still exist
/* Close it since we abondoned it. If the connection does still exist
* on the other end we can't rely on it after this point since we didn't
* listen long enough for this response.
*/
if (!(*persist_conn->shutdown) &&
persist_conn->flags & PERSIST_FLAG_RECONNECT)
if (persist_conn->flags & PERSIST_FLAG_RECONNECT)
slurm_persist_conn_reopen(persist_conn, true);
return 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