From 56a870930deb173f645dc6e15ce6b5f1899212ab Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 29 May 2014 13:02:40 -0700
Subject: [PATCH] Increase time for slurmctld to shutdown
Previous limit was 4 secs, raised to 10.
---
src/slurmctld/controller.c | 6 ++++--
src/slurmctld/slurmctld.h | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 8c270cc70ed..92a96a5e6c8 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -1422,8 +1422,10 @@ static void *_slurmctld_background(void *no_data)
if (_report_locks_set() == 0) {
info("Saving all slurm state");
save_all_state();
- } else
- error("can not save state, semaphores set");
+ } else {
+ error("Semaphores still set after %d seconds, "
+ "can not save state", CONTROL_TIMEOUT);
+ }
break;
}
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 8656436c43d..7c20d6552cc 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -135,7 +135,7 @@
/* Seconds to wait for backup controller response to REQUEST_CONTROL RPC */
#ifndef CONTROL_TIMEOUT
-#define CONTROL_TIMEOUT 4 /* seconds */
+#define CONTROL_TIMEOUT 10 /* seconds */
#endif
/*****************************************************************************\
--
GitLab