From bd624df48d6eae9237b2833cd32dc5b73861319e Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 15 Sep 2003 23:05:06 +0000
Subject: [PATCH] Recover the QSW state information each time the backup
controller assumes control. It previously captured state only when the backup
controller daemon was initiated.
---
src/slurmctld/controller.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index a15f3b5df48..5e89f80fdc6 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -139,11 +139,6 @@ int main(int argc, char *argv[])
*/
_init_pidfile();
- if (switch_state_begin(recover)) {
- error("switch_state_begin: %m");
- exit(1);
- }
-
if ((slurmctld_conf.slurm_user_id) &&
(slurmctld_conf.slurm_user_id != getuid()) &&
(setuid(slurmctld_conf.slurm_user_id))) {
@@ -213,6 +208,9 @@ int main(int argc, char *argv[])
exit(0);
}
+ if (switch_state_begin(recover))
+ fatal("switch_state_begin: %m");
+
/*
* create attached thread for signal handling
*/
--
GitLab