From a4464a610c49bcd84f2f21791f0bba6ccbabf9d7 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 18 Jan 2007 19:49:12 +0000
Subject: [PATCH] Convert resend TERMINATE_JOB message from info() to debug()
for all but first one to reduce logging load.
---
src/slurmctld/node_scheduler.c | 16 ++++++++++++++--
src/slurmctld/slurmctld.h | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index d77aaf3f18b..62b625cffd8 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -1590,6 +1590,7 @@ extern void re_kill_job(struct job_record *job_ptr)
agent_arg_t *agent_args;
hostlist_t kill_hostlist = hostlist_create("");
char host_str[64];
+ static uint32_t last_job_id = 0;
xassert(job_ptr);
xassert(job_ptr->details);
@@ -1644,12 +1645,23 @@ extern void re_kill_job(struct job_record *job_ptr)
hostlist_ranged_string(kill_hostlist,
sizeof(host_str), host_str);
#ifdef HAVE_BG
- info("Resending TERMINATE_JOB request JobId=%u BPlist=%s",
+ if (job_ptr->job_id != last_job_id) {
+ info("Resending TERMINATE_JOB request JobId=%u BPlist=%s",
job_ptr->job_id, host_str);
+ } else {
+ debug("Resending TERMINATE_JOB request JobId=%u BPlist=%s",
+ job_ptr->job_id, host_str);
+ }
#else
- info("Resending TERMINATE_JOB request JobId=%u Nodelist=%s",
+ if (job_ptr->job_id != last_job_id) {
+ info("Resending TERMINATE_JOB request JobId=%u Nodelist=%s",
job_ptr->job_id, host_str);
+ } else {
+ debug("Resending TERMINATE_JOB request JobId=%u Nodelist=%s",
+ job_ptr->job_id, host_str);
+ }
#endif
+ last_job_id = job_ptr->job_id;
hostlist_destroy(kill_hostlist);
agent_args->msg_args = kill_job;
agent_queue_request(agent_args);
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index d0ae1c968c6..280521da634 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -110,7 +110,7 @@
/* Attempt to purge defunct job records and resend job kill requests
* every PURGE_JOB_INTERVAL seconds */
-#define PURGE_JOB_INTERVAL 300
+#define PURGE_JOB_INTERVAL 60
/* Pathname of group file record for checking update times */
#define GROUP_FILE "/etc/group"
--
GitLab