Browse files

new tag

  • Loading branch information...
1 parent c4177fb commit 0b2d911c558a5af03cea013be1e81172dc97845b @dannyauble dannyauble committed Oct 8, 2009
View
2 META
@@ -11,7 +11,7 @@
Minor: 0
Micro: 6
Version: 2.0.6
- Release: 1
+ Release: 3
##
# When changing API_CURRENT update src/common/slurm_protocol_common.h
# with a new SLURM_PROTOCOL_VERSION signifing the old one and the version
View
21 src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -1894,22 +1894,13 @@ extern int set_all_bps_except(char *bps)
y = temp;
temp = start % HOSTLIST_BASE;
z = temp;
- if(ba_system_ptr->grid[x][y][z].state != NODE_STATE_IDLE) {
- error("we can't use this node %c%c%c",
- alpha_num[x],
- alpha_num[y],
- alpha_num[z]);
-
- return SLURM_ERROR;
- }
- ba_system_ptr->grid[x][y][z].state = NODE_STATE_END;
+ if((ba_system_ptr->grid[x][y][z].state == NODE_STATE_UNKNOWN)
+ || (ba_system_ptr->grid[x][y][z].state == NODE_STATE_IDLE))
+ ba_system_ptr->grid[x][y][z].state = NODE_STATE_END;
#else
- if(ba_system_ptr->grid[x].state != NODE_STATE_IDLE) {
- error("we can't use this node %d", x);
-
- return SLURM_ERROR;
- }
- ba_system_ptr->grid[x].state = NODE_STATE_END;
+ if((ba_system_ptr->grid[x].state == NODE_STATE_UNKNOWN)
+ || (ba_system_ptr->grid[x].state == NODE_STATE_IDLE))
+ ba_system_ptr->grid[x].state = NODE_STATE_END;
#endif
free(host);
}
View
14 src/plugins/select/bluegene/plugin/bg_block_info.c
@@ -382,7 +382,17 @@ extern int update_block_list()
xfree(bg_record->target_name);
bg_record->target_name =
xstrdup(bg_record->user_name);
- }
+ } else if((bg_record->state
+ == RM_PARTITION_DEALLOCATING)
+ && (state == RM_PARTITION_CONFIGURING))
+ /* This is a funky state IBM says
+ isn't a bug, but all their
+ documentation says this doesn't
+ happen, but IBM says oh yeah, you
+ weren't really suppose to notice
+ that. So we will just skip this
+ state and act like this didn't happen. */
+ goto nochange_state;
bg_record->state = state;
@@ -425,8 +435,8 @@ extern int update_block_list()
trigger_block_error();
}
updated = 1;
-
}
+ nochange_state:
/* check the boot state */
debug3("boot state for block %s is %d",

0 comments on commit 0b2d911

Please sign in to comment.