From 507c93b62d03bdb59a056f35862eeb61a857c7b9 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 7 Apr 2009 16:54:40 +0000
Subject: [PATCH] svn merge -r17164:17171
https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
---
src/plugins/select/bluegene/plugin/bg_record_functions.c | 6 +++---
src/plugins/select/bluegene/plugin/select_bluegene.c | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c
index 94ddc22eb98..6b12e5fad4b 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.c
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c
@@ -1324,7 +1324,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record, int state)
sleep(1);
}
- error("Setting Block %s to ERROR state.", bg_record->bg_block_id);
+ info("Setting Block %s to ERROR state.", bg_record->bg_block_id);
/* we add the block to these lists so we don't try to schedule
on them. */
if(!block_ptr_exist_in_list(bg_job_block_list, bg_record)) {
@@ -1365,8 +1365,8 @@ extern int resume_block(bg_record_t *bg_record)
if(bg_record->job_running >= NO_JOB_RUNNING)
return SLURM_SUCCESS;
- debug("block %s put back into service after "
- "being in an error state",
+ info("Block %s put back into service after "
+ "being in an error state.",
bg_record->bg_block_id);
if(remove_from_bg_list(bg_job_block_list, bg_record) == SLURM_SUCCESS)
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index d110843cd38..9e420e7da9e 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -726,6 +726,8 @@ extern int select_p_update_sub_node (update_part_msg_t *part_desc_ptr)
node_name = xstrdup_printf("%s%s", bg_slurm_node_prefix, coord);
/* find out how many nodecards to get for each ionode */
if(!part_desc_ptr->state_up) {
+ info("Admin setting %s[%s] in an error state",
+ node_name, ionodes);
for(i = 0; i<bluegene_numpsets; i++) {
if(bit_test(ionode_bitmap, i)) {
if((int)nc_pos != (int)last_pos) {
@@ -736,6 +738,8 @@ extern int select_p_update_sub_node (update_part_msg_t *part_desc_ptr)
nc_pos += bluegene_nc_ratio;
}
} else if(part_desc_ptr->state_up){
+ info("Admin setting %s[%s] in an free state",
+ node_name, ionodes);
up_nodecard(node_name, ionode_bitmap);
} else {
return rc;
--
GitLab