From bc28092531a8d5e61b2f05730583a2d76dba171c Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 23 Dec 2015 14:47:58 -0800
Subject: [PATCH] Filter some warning message for HTC

Filter out some message commonly generated in high-throughput
  computing environments.
bug 2282
---
 src/common/slurmdbd_defs.c    | 2 +-
 src/slurmctld/agent.c         | 4 ++--
 src/slurmctld/job_scheduler.c | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index 7fabbf86e76..ee06be5b753 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -2129,7 +2129,7 @@ static void *_agent(void *x)
 						      &abs_time);
 			slurm_mutex_unlock(&agent_lock);
 			continue;
-		} else if ((cnt > 0) && ((cnt % 50) == 0))
+		} else if ((cnt > 0) && ((cnt % 100) == 0))
 			info("slurmdbd: agent queue size %u", cnt);
 		/* Leave item on the queue until processing complete */
 		if (agent_list) {
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 51ea4cce552..3d6bfbacc8b 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -1270,10 +1270,10 @@ extern int agent_retry (int min_wait, bool mail_too)
 		static time_t last_msg_time = (time_t) 0;
 		uint32_t msg_type[5] = {0, 0, 0, 0, 0}, i = 0;
 		list_size = list_count(retry_list);
-		if ((list_size > 50) &&
+		if ((list_size > 100) &&
 		    (difftime(now, last_msg_time) > 300)) {
 			/* Note sizable backlog of work */
-			info("WARNING: agent retry_list size is %d",
+			info("slurmctld: agent retry_list size is %d",
 				list_size);
 			retry_iter = list_iterator_create(retry_list);
 			while ((queued_req_ptr = (queued_request_t *)
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 9c1469870b3..651a5101c73 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -1763,7 +1763,8 @@ next_task:
 	}
 	xfree(sched_part_ptr);
 	xfree(sched_part_jobs);
-	if (slurmctld_config.server_thread_count >= 150) {
+	if ((slurmctld_config.server_thread_count >= 150) &&
+	    (defer_rpc_cnt == 0)) {
 		info("sched: %d pending RPCs at cycle end, consider "
 		     "configuring max_rpc_cnt",
 		     slurmctld_config.server_thread_count);
-- 
GitLab