From 159c3d13b06149120c48040f3a99df1afad763eb Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 11 Oct 2007 23:14:46 +0000
Subject: [PATCH] add delay in slurmctld shutdown so that REQUEST_SHUTDOWN has
time to get propagated to slurmd
---
src/slurmctld/controller.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 1247b9e531f..07d70567354 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -174,7 +174,7 @@ typedef struct connection_arg {
/* main - slurmctld main function, start various threads and process RPCs */
int main(int argc, char *argv[])
{
- int error_code;
+ int cnt, error_code, i;
pthread_attr_t thread_attr;
struct stat stat_buf;
@@ -389,10 +389,8 @@ int main(int argc, char *argv[])
slurmctld_conf.slurmctld_pidfile);
#ifdef MEMORY_LEAK_DEBUG
-{
/* This should purge all allocated memory, *\
\* Anything left over represents a leak. */
- int i, cnt;
/* Give running agents a chance to complete and free memory.
* Wait up to 30 seconds (3 seconds * 10) */
@@ -430,7 +428,16 @@ int main(int argc, char *argv[])
slurm_conf_destroy();
slurm_api_clear_config();
sleep(2);
-}
+#else
+ /* Give REQUEST_SHUTDOWN a chance to get propagated,
+ * up to 6 seconds. */
+ for (i=0; i<6; i++) {
+ agent_purge();
+ cnt = get_agent_count();
+ if (cnt == 0)
+ break;
+ sleep(1);
+ }
#endif
info("Slurmctld shutdown completing");
--
GitLab