From 29e69f32ca0b3269267b96c32ba3b46b171ec6d2 Mon Sep 17 00:00:00 2001
From: Bill Brophy <bill.brophy@bull.com>
Date: Fri, 18 Jul 2014 10:44:32 -0700
Subject: [PATCH] When creating reservation with CoreCnt check that Slurm uses
SelectType=select/cons_res otherwise don't send the request to slurmctld and
return an error.
---
src/scontrol/create_res.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/scontrol/create_res.c b/src/scontrol/create_res.c
index 27399ce1e3d..46f3ba55b91 100644
--- a/src/scontrol/create_res.c
+++ b/src/scontrol/create_res.c
@@ -301,8 +301,17 @@ scontrol_parse_res_options(int argc, char *argv[], const char *msg,
strncasecmp(tag, "CPUCount", MAX(taglen,5)) == 0) {
char *endptr = NULL, *core_cnt, *tok, *ptrptr = NULL;
+ char *type = NULL;
int node_inx = 0;
+ type = slurm_get_select_type();
+ if (!strcasecmp(type, "select/linear")) {
+ error("Invalid to use CoreCnt or CPUCnt with "
+ "SelectType=select/linear");
+ xfree(type);
+ return -1;
+ }
+ xfree(type);
core_cnt = xstrdup(val);
tok = strtok_r(core_cnt, ",", &ptrptr);
while (tok) {
--
GitLab