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

Add on to commit 8464d75f to handle other things that needed to be freed in

the function.
parent 46d30dcd
No related branches found
No related tags found
No related merge requests found
...@@ -182,13 +182,14 @@ main (int argc, char **argv) ...@@ -182,13 +182,14 @@ main (int argc, char **argv)
* and blocks until the step is complete */ * and blocks until the step is complete */
rc = job_manager(job); rc = job_manager(job);
return stepd_cleanup(msg, job, rc, 0); return stepd_cleanup(msg, job, cli, self, rc, 0);
ending: ending:
return stepd_cleanup(msg, job, rc, 1); return stepd_cleanup(msg, job, cli, self, rc, 1);
} }
extern int stepd_cleanup(slurm_msg_t *msg, stepd_step_rec_t *job, int rc, extern int stepd_cleanup(slurm_msg_t *msg, stepd_step_rec_t *job,
bool only_mem) slurm_addr_t *cli, slurm_addr_t *self,
int rc, bool only_mem)
{ {
if (!only_mem) { if (!only_mem) {
if (job->batch) if (job->batch)
......
...@@ -67,7 +67,8 @@ extern step_complete_t step_complete; ...@@ -67,7 +67,8 @@ extern step_complete_t step_complete;
extern slurmd_conf_t *conf; extern slurmd_conf_t *conf;
extern int stepd_cleanup(slurm_msg_t *msg, stepd_step_rec_t *job, int rc, extern int stepd_cleanup(slurm_msg_t *msg, stepd_step_rec_t *job,
bool only_mem); slurm_addr_t *cli, slurm_addr_t *self,
int rc, bool only_mem);
#endif /* !_SLURMSTEPD_H */ #endif /* !_SLURMSTEPD_H */
...@@ -152,7 +152,7 @@ static void *_monitor(void *arg) ...@@ -152,7 +152,7 @@ static void *_monitor(void *arg)
entity, job->node_name, time_str); entity, job->node_name, time_str);
} }
stepd_cleanup(NULL, job, SLURM_ERROR, 0); stepd_cleanup(NULL, job, NULL, NULL, SLURM_ERROR, 0);
abort(); abort();
} else if (rc != 0) { } else if (rc != 0) {
error("Error waiting on condition in _monitor: %m"); error("Error waiting on condition in _monitor: %m");
......
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