From 775ce2dc4a3481dfba6812dea262a9d997fe4b55 Mon Sep 17 00:00:00 2001 From: Moe Jette <jette1@llnl.gov> Date: Wed, 11 Jun 2003 22:42:42 +0000 Subject: [PATCH] Fix bug in how KillWait default value is processed in config file. --- src/common/read_config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/read_config.c b/src/common/read_config.c index 02509c3bf27..a521223ecd0 100644 --- a/src/common/read_config.c +++ b/src/common/read_config.c @@ -111,7 +111,7 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr) ctl_conf_ptr->inactive_limit = (uint16_t) NO_VAL; xfree (ctl_conf_ptr->job_credential_private_key); xfree (ctl_conf_ptr->job_credential_public_certificate); - ctl_conf_ptr->kill_wait = (uint16_t) 30; + ctl_conf_ptr->kill_wait = (uint16_t) NO_VAL; xfree (ctl_conf_ptr->plugindir); xfree (ctl_conf_ptr->prioritize); xfree (ctl_conf_ptr->prolog); @@ -745,6 +745,9 @@ validate_config (slurm_ctl_conf_t *ctl_conf_ptr) if (ctl_conf_ptr->slurmd_debug != (uint16_t) NO_VAL) _normalize_debug_level(&ctl_conf_ptr->slurmd_debug); + + if (ctl_conf_ptr->kill_wait == (uint16_t) NO_VAL) + ctl_conf_ptr->kill_wait = 30; } /* Normalize supplied debug level to be in range per log.h definitions */ -- GitLab