From 8bba5e37ff272209eec9d70ad30f36bdeefeb175 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 2 May 2007 18:39:22 +0000
Subject: [PATCH] svn merge -r11424:11442
https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
---
NEWS | 1 +
src/slurmctld/read_config.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 7041e7901de..d2683bb4b75 100644
--- a/NEWS
+++ b/NEWS
@@ -293,6 +293,7 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 1.1.36
=========================
+ - Permit node state specification of DRAIN in slurm.conf.
* Changes in SLURM 1.1.35
=========================
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 832d21371a6..ada8a93c978 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -299,10 +299,11 @@ static int _state_str2int(const char *state_str)
break;
}
}
- if ((i == 0) && (strncasecmp("DRAIN", state_str, 5) == 0))
+ if ((i >= NODE_STATE_END)
+ && (strncasecmp("DRAIN", state_str, 5) == 0))
state_val = NODE_STATE_IDLE | NODE_STATE_DRAIN;
if (state_val == NO_VAL) {
- error("invalid state %s", state_str);
+ error("invalid node state %s", state_str);
errno = EINVAL;
}
return state_val;
--
GitLab