From 2fc85ab8b9269218bcf3deb5b9f0a5bb53fcce05 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Sat, 15 Jan 2011 18:59:45 +0000
Subject: [PATCH] Patch from Gerrit:
32_Cray-no-unconditional-return-to-service.diff
select/cray: disable node state alteration via slurmd
This disables unconditionally setting up DOWN nodes on Cray systems, since this
interferes with the periodic node-state query via Basil/ALPS inventory requests.
---
doc/man/man5/slurm.conf.5 | 1 +
src/common/read_config.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 56e5e2fe18f..ca353a1568b 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1284,6 +1284,7 @@ be changed.
\fB2\fR
A DOWN node will become available for use upon registration with a
valid configuration. The node could have been set DOWN for any reason.
+(Disabled on Cray systems.)
.RE
.TP
diff --git a/src/common/read_config.c b/src/common/read_config.c
index f6e7b08df2d..db15d904aac 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -2702,6 +2702,10 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!s_p_get_uint16(&conf->ret2service, "ReturnToService", hashtbl))
conf->ret2service = DEFAULT_RETURN_TO_SERVICE;
+#ifdef HAVE_NATIVE_CRAY
+ if (conf->ret2service > 1)
+ fatal("ReturnToService > 1 is not supported on Cray");
+#endif
s_p_get_uint16(&conf->resv_over_run, "ResvOverRun", hashtbl);
--
GitLab