From 28c1fce4cc047649d69833f20fef9e3eb3fac64a Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 22 Jul 2003 22:43:05 +0000
Subject: [PATCH] Make shutdown of BackupController cleaner (wait for pthreads
to complete and call log_fini()).
---
src/slurmctld/controller.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 28cd3ef5960..531bcfa0588 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
else if (slurmctld_conf.control_machine &&
(strcmp(node_name, slurmctld_conf.control_machine)
== 0))
- debug3("Running primary controller");
+ debug("Running primary controller");
else {
error
("this host (%s) not valid controller (%s or %s)",
@@ -2213,8 +2213,12 @@ static void _run_backup(void)
slurmctld_conf.slurmctld_timeout)
break;
}
- if (shutdown_time != 0)
+ if (shutdown_time != 0) {
+ pthread_join(thread_id_sig, NULL);
+ info("BackupController terminating");
+ log_fini();
exit(0);
+ }
error
("ControlMachine %s not responding, BackupController %s taking over",
--
GitLab