From 4c2fc91e10c26b927bca22a13bdb110ab193a8c4 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 7 Nov 2003 17:13:00 +0000
Subject: [PATCH] Wait at least KillWait time after issuing first KILL_JOB RPC
before re-issuing it (reduces communications overhead).
---
src/slurmctld/job_mgr.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 660e6bfc210..cd38532d94e 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -2227,10 +2227,13 @@ static int _list_find_job_id(void *job_entry, void *key)
*/
static int _list_find_job_old(void *job_entry, void *key)
{
- time_t min_age = time(NULL) - slurmctld_conf.min_job_age;
+ time_t now = time(NULL);
+ time_t kill_age = now - slurmctld_conf.kill_wait;
+ time_t min_age = now - slurmctld_conf.min_job_age;
struct job_record *job_ptr = (struct job_record *)job_entry;
- if (job_ptr->job_state & JOB_COMPLETING) {
+ if ( (job_ptr->job_state & JOB_COMPLETING) &&
+ (job_ptr->end_time < kill_age) ) {
re_kill_job(job_ptr);
return 0; /* Job still completing */
}
--
GitLab