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

Make shutdown of BackupController cleaner (wait for pthreads to complete

and call log_fini()).
parent bedc2750
No related branches found
No related tags found
No related merge requests found
...@@ -265,7 +265,7 @@ int main(int argc, char *argv[]) ...@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
else if (slurmctld_conf.control_machine && else if (slurmctld_conf.control_machine &&
(strcmp(node_name, slurmctld_conf.control_machine) (strcmp(node_name, slurmctld_conf.control_machine)
== 0)) == 0))
debug3("Running primary controller"); debug("Running primary controller");
else { else {
error error
("this host (%s) not valid controller (%s or %s)", ("this host (%s) not valid controller (%s or %s)",
...@@ -2213,8 +2213,12 @@ static void _run_backup(void) ...@@ -2213,8 +2213,12 @@ static void _run_backup(void)
slurmctld_conf.slurmctld_timeout) slurmctld_conf.slurmctld_timeout)
break; break;
} }
if (shutdown_time != 0) if (shutdown_time != 0) {
pthread_join(thread_id_sig, NULL);
info("BackupController terminating");
log_fini();
exit(0); exit(0);
}
error error
("ControlMachine %s not responding, BackupController %s taking over", ("ControlMachine %s not responding, BackupController %s taking over",
......
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