From 88bb16aab3e4f3e49be4d982df68f6d7fb407e66 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 2 Sep 2009 19:34:57 +0000
Subject: [PATCH] change things to be the new style of NODE_IS_*
---
src/plugins/select/bluegene/block_allocator/block_allocator.c | 3 ++-
src/slurmctld/node_mgr.c | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index 3d10468dc1c..76584ea37ec 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -1204,6 +1204,7 @@ extern void ba_fini()
extern void ba_update_node_state(ba_node_t *ba_node, uint16_t state)
{
uint16_t node_base_state = state & NODE_STATE_BASE;
+ uint16_t node_flags = state & NODE_STATE_FLAGS;
if (!_initialized){
error("Error, configuration not initialized, "
@@ -1223,7 +1224,7 @@ extern void ba_update_node_state(ba_node_t *ba_node, uint16_t state)
/* basically set the node as used */
if((node_base_state == NODE_STATE_DOWN)
- || (state & NODE_STATE_DRAIN))
+ || (node_flags & (NODE_STATE_DRAIN | NODE_STATE_FAIL)))
ba_node->used = true;
else
ba_node->used = false;
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 4ee7a54f809..a0a3117243e 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -647,8 +647,7 @@ extern int load_all_node_state ( bool state_only )
until the nodes check in. This is needed
for bluegene to set up drained nodes
correctly. */
- if((node_ptr->node_state & NODE_STATE_BASE)
- == NODE_STATE_UNKNOWN)
+ if(IS_NODE_UNKNOWN(node_ptr))
node_ptr->node_state |= NODE_STATE_IDLE;
select_g_update_node_state(
--
GitLab