From c54736fe7357286647230a281955bb46730c3317 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 7 Aug 2003 23:52:12 +0000
Subject: [PATCH] Add new error code for invalid node state. Add new logic to
prevent some node state transitions via update_node RPC (e.g. IDLE to
ALLOCATED).
---
src/slurmctld/node_mgr.c | 58 +++++++++++++++++++++++++++++++---------
src/slurmctld/proc_req.c | 4 +--
2 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index ad62f5b5001..252ca3c20a7 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -77,6 +77,8 @@ static void _make_node_down(struct node_record *node_ptr);
static void _pack_node (struct node_record *dump_node_ptr, Buf buffer);
static void _split_node_name (char *name, char *prefix, char *suffix,
int *index, int *digits);
+static bool _valid_node_state_change(enum node_states old,
+ enum node_states new);
#if DEBUG_SYSTEM
static void _dump_hash (void);
@@ -944,6 +946,18 @@ int update_node ( update_node_msg_t * update_node_msg )
break;
}
+ if (state_val != NO_VAL) {
+ base_state = node_ptr->node_state & (~NODE_STATE_NO_RESPOND);
+ if (!_valid_node_state_change(base_state, state_val)) {
+ info ("Invalid node state transition requested "
+ "for node %s from=%s to=%s",
+ this_node_name,
+ node_state_string(base_state),
+ node_state_string(state_val));
+ state_val = NO_VAL;
+ error_code = ESLURM_INVALID_NODE_STATE;
+ }
+ }
if (state_val != NO_VAL) {
if (state_val == NODE_STATE_DOWN) {
/* We must set node down before killing its jobs */
@@ -953,10 +967,6 @@ int update_node ( update_node_msg_t * update_node_msg )
bit_set (idle_node_bitmap, node_inx);
bit_clear (avail_node_bitmap, node_inx);
}
- else if (state_val == NODE_STATE_UNKNOWN) {
- bit_clear (avail_node_bitmap, node_inx);
- bit_clear (idle_node_bitmap, node_inx);
- }
else if (state_val == NODE_STATE_IDLE) {
bit_set (avail_node_bitmap, node_inx);
bit_set (idle_node_bitmap, node_inx);
@@ -973,16 +983,10 @@ int update_node ( update_node_msg_t * update_node_msg )
state_val = NODE_STATE_DRAINING;
bit_clear (avail_node_bitmap, node_inx);
}
- else if (state_val == NODE_STATE_NO_RESPOND) {
- bit_clear (avail_node_bitmap, node_inx);
- node_ptr->node_state |= NODE_STATE_NO_RESPOND;
- info ("update_node: node %s state set to %s",
- this_node_name, "NoResp");
- err_code = 1;
- }
else {
- error ("Invalid node state specified %d", state_val);
+ info ("Invalid node state specified %d", state_val);
err_code = 1;
+ error_code = ESLURM_INVALID_NODE_STATE;
}
if (err_code == 0) {
@@ -1015,6 +1019,36 @@ int update_node ( update_node_msg_t * update_node_msg )
return error_code;
}
+/* Return true if admin request to change node state from old to new is valid */
+static bool _valid_node_state_change(enum node_states old, enum node_states new)
+{
+ if (old == new)
+ return true;
+
+ switch (new) {
+ case NODE_STATE_DOWN:
+ case NODE_STATE_DRAINED:
+ case NODE_STATE_DRAINING:
+ return true;
+ break;
+
+ case NODE_STATE_IDLE:
+ if ((old == NODE_STATE_DRAINED) ||
+ (old == NODE_STATE_DOWN))
+ return true;
+ break;
+
+ case NODE_STATE_ALLOCATED:
+ if (old == NODE_STATE_DRAINING)
+ return true;
+ break;
+
+ default: /* All others invalid */
+ break;
+ }
+
+ return false;
+}
/*
* validate_node_specs - validate the node's specifications as valid,
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 63408d34c96..448de6f728c 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1366,7 +1366,7 @@ static void _slurm_rpc_update_node(slurm_msg_t * msg)
/* return result */
if (error_code) {
- error("_slurm_rpc_update_node for %s: %s",
+ info("_slurm_rpc_update_node for %s: %s",
update_node_msg_ptr->node_names,
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
@@ -1415,7 +1415,7 @@ static void _slurm_rpc_update_partition(slurm_msg_t * msg)
/* return result */
if (error_code) {
- error("_slurm_rpc_update_partition partition=%s: %s",
+ info("_slurm_rpc_update_partition partition=%s: %s",
part_desc_ptr->name, slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
--
GitLab