Permalink
Browse files

create v2.1.12-2 tag

  • Loading branch information...
2 parents 68eb5a5 + 0b3b42f commit 8e91f072c1977d575b32c7937d849159f1e60484 Moe Jette committed Sep 20, 2010
Showing with 8 additions and 25 deletions.
  1. +5 −2 NEWS
  2. +1 −1 etc/init.d.slurm
  3. +1 −1 etc/init.d.slurmdbd
  4. +1 −21 src/slurmctld/node_mgr.c
View
@@ -3,8 +3,11 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 2.1.12-2
===========================
- -- Fix race condition which can set a node state to IDLE on slurmctld startup
- even if it has running jobs.
+ -- Modify init.d/slurm and slurmdbd scripts to prevent the possible
+ inadvertent inclusion of "." in LD_LIBRARY_PATH environment variable.
+ To fail, the script would need to be executed by user root or SlurmUser
+ without the LD_LIBRARY_PATH environment variable set and there would
+ have to be a maliciously altered library in the working directory.
* Changes in SLURM 2.1.12
=========================
View
@@ -80,7 +80,7 @@ if [ ! -f $CONFDIR/slurm.conf ]; then
fi
# setup library paths for slurm and munge support
-export LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=$LIBDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
start() {
prog=$1
View
@@ -69,7 +69,7 @@ if [ ! -f $CONFDIR/slurmdbd.conf ]; then
fi
# setup library paths for slurm and munge support
-export LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=$LIBDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
start() {
prog=$1
@@ -1420,14 +1420,6 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
(reg_msg->job_count == 0)) { /* job already done */
last_node_update = now;
node_ptr->node_state &= (~NODE_STATE_COMPLETING);
- } else if (IS_NODE_IDLE(node_ptr) &&
- (reg_msg->job_count != 0)) {
- last_node_update = now;
- node_ptr->node_state = NODE_STATE_ALLOCATED |
- node_flags;
- error("Invalid state for node %s, was IDLE with %u "
- "running jobs",
- node_ptr->name, reg_msg->job_count);
}
select_g_update_node_config((node_ptr-node_record_table_ptr));
@@ -1648,14 +1640,6 @@ extern int validate_nodes_via_front_end(
updated_job = true;
node_ptr->node_state &=
(~NODE_STATE_COMPLETING);
- } else if (IS_NODE_IDLE(node_ptr) &&
- (jobs_on_node != 0)) {
- updated_job = true;
- node_ptr->node_state = NODE_STATE_ALLOCATED |
- node_flags;
- error("Invalid state for node %s, was IDLE "
- "with %u running jobs",
- node_ptr->name, reg_msg->job_count);
}
select_g_update_node_config(
@@ -1763,11 +1747,7 @@ static void _node_did_resp(struct node_record *node_ptr)
if (IS_NODE_UNKNOWN(node_ptr)) {
last_node_update = now;
node_ptr->last_idle = now;
- if (node_ptr->run_job_cnt) {
- node_ptr->node_state = NODE_STATE_ALLOCATED |
- node_flags;
- } else
- node_ptr->node_state = NODE_STATE_IDLE | node_flags;
+ node_ptr->node_state = NODE_STATE_IDLE | node_flags;
if (!IS_NODE_DRAIN(node_ptr) && !IS_NODE_FAIL(node_ptr)) {
clusteracct_storage_g_node_up(acct_db_conn,
slurmctld_cluster_name,

0 comments on commit 8e91f07

Please sign in to comment.