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

Add free of api config data structure on termination to more easily

  see memory leaks.
parent 06d1ed1d
No related branches found
No related tags found
No related merge requests found
...@@ -305,6 +305,7 @@ int main(int argc, char *argv[]) ...@@ -305,6 +305,7 @@ int main(int argc, char *argv[])
node_fini(); node_fini();
slurm_cred_ctx_destroy(slurmctld_config.cred_ctx); slurm_cred_ctx_destroy(slurmctld_config.cred_ctx);
free_slurm_conf(&slurmctld_conf); free_slurm_conf(&slurmctld_conf);
slurm_api_clear_config();
#endif #endif
log_fini(); log_fini();
...@@ -350,7 +351,7 @@ static void _init_config(void) ...@@ -350,7 +351,7 @@ static void _init_config(void)
slurmctld_config.thread_count_lock = 0; slurmctld_config.thread_count_lock = 0;
slurmctld_config.thread_id_main = 0; slurmctld_config.thread_id_main = 0;
slurmctld_config.thread_id_sig = 0; slurmctld_config.thread_id_sig = 0;
slurmctld_config.thread_id_rpc = 0; slurmctld_config.thread_id_rpc = 0;
#endif #endif
} }
...@@ -782,8 +783,7 @@ int slurmctld_shutdown(void) ...@@ -782,8 +783,7 @@ int slurmctld_shutdown(void)
/* no response */ /* no response */
/* shutdown message connection */ /* shutdown message connection */
if ((rc = slurm_shutdown_msg_conn(sockfd)) if ((rc = slurm_shutdown_msg_conn(sockfd)) == SLURM_SOCKET_ERROR) {
== SLURM_SOCKET_ERROR) {
error("slurm_shutdown_msg_conn error"); error("slurm_shutdown_msg_conn error");
return SLURM_SOCKET_ERROR; return SLURM_SOCKET_ERROR;
} }
......
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