From 4a92f6f5d4690ca6ad5731fd56a7db76d8aa4ff1 Mon Sep 17 00:00:00 2001
From: jette <jette@schedmd.com>
Date: Thu, 26 Nov 2015 09:47:53 -0800
Subject: [PATCH] Accept max_rpc_count parameter
SchedulerParameters now accepts keyword of "max_rpc_count" in
addition to the documented "max_rpc_cnt"
---
src/plugins/sched/backfill/backfill.c | 3 +++
src/slurmctld/job_scheduler.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index 29410259972..c6f6fa36fbf 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -639,6 +639,9 @@ static void _load_config(void)
if (sched_params && (tmp_ptr=strstr(sched_params, "max_rpc_cnt=")))
defer_rpc_cnt = atoi(tmp_ptr + 12);
+ else if (sched_params &&
+ (tmp_ptr=strstr(sched_params, "max_rpc_count=")))
+ defer_rpc_cnt = atoi(tmp_ptr + 14);
if (defer_rpc_cnt < 0) {
error("Invalid SchedulerParameters max_rpc_cnt: %d",
defer_rpc_cnt);
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 765ba066db6..6f09d73fa74 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -1109,6 +1109,9 @@ static int _schedule(uint32_t job_limit)
if (sched_params &&
(tmp_ptr=strstr(sched_params, "max_rpc_cnt=")))
defer_rpc_cnt = atoi(tmp_ptr + 12);
+ else if (sched_params &&
+ (tmp_ptr=strstr(sched_params, "max_rpc_count=")))
+ defer_rpc_cnt = atoi(tmp_ptr + 14);
if (defer_rpc_cnt < 0) {
error("Invalid max_rpc_cnt: %d", defer_rpc_cnt);
defer_rpc_cnt = 0;
--
GitLab