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

Remainer of memory now accounted for.

parent e4a131ba
No related branches found
No related tags found
No related merge requests found
...@@ -144,6 +144,13 @@ slurmd_req(slurm_msg_t *msg) ...@@ -144,6 +144,13 @@ slurmd_req(slurm_msg_t *msg)
{ {
int rc; int rc;
if (msg == NULL) {
if (waiters)
list_destroy(waiters);
waiters = NULL;
return;
}
switch(msg->msg_type) { switch(msg->msg_type) {
case REQUEST_BATCH_JOB_LAUNCH: case REQUEST_BATCH_JOB_LAUNCH:
/* Mutex locking moved into _rpc_batch_job() due to /* Mutex locking moved into _rpc_batch_job() due to
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
/* Process request contained in slurm message `msg' from client at /* Process request contained in slurm message `msg' from client at
* msg->orig_addr * msg->orig_addr
*
* If msg == NULL, then purge allocated memory.
*/ */
void slurmd_req(slurm_msg_t *msg); void slurmd_req(slurm_msg_t *msg);
......
...@@ -985,6 +985,10 @@ cleanup: ...@@ -985,6 +985,10 @@ cleanup:
* *
* Then exercise the slurmd functionality before executing * Then exercise the slurmd functionality before executing
* > scontrol shutdown * > scontrol shutdown
*
* There should be some definitely lost records from
* init_setproctitle (setproctitle.c), but it should otherwise account
* for all memory.
\**************************************************************************/ \**************************************************************************/
static int static int
_slurmd_fini() _slurmd_fini()
...@@ -996,6 +1000,7 @@ _slurmd_fini() ...@@ -996,6 +1000,7 @@ _slurmd_fini()
slurm_conf_destroy(); slurm_conf_destroy();
slurm_proctrack_fini(); slurm_proctrack_fini();
slurm_auth_fini(); slurm_auth_fini();
slurmd_req(NULL); /* purge memory allocated by slurmd_req() */
return SLURM_SUCCESS; return SLURM_SUCCESS;
} }
......
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