From 84ac9bda1581662ee009c57e13b19dbc79e0d94c Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 27 Feb 2008 16:49:03 +0000
Subject: [PATCH] svn merge -r13326:13373
https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
---
src/api/step_launch.c | 1 +
src/plugins/select/cons_res/select_cons_res.c | 2 ++
src/slurmctld/job_mgr.c | 1 +
src/slurmctld/proc_req.c | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index 1b965628a07..8ba2ccb3b4b 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -832,6 +832,7 @@ _node_fail_handler(struct step_launch_state *sls, slurm_msg_t *fail_msg)
int i, j;
int node_id, num_tasks;
+ error("Node failure on %s", nf->nodelist);
fail_nodes = hostset_create(nf->nodelist);
fail_itr = hostset_iterator_create(fail_nodes);
num_node_ids = hostset_count(fail_nodes);
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index f833d8f5b3c..94b2635e070 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -1411,6 +1411,8 @@ extern int select_p_state_restore(char *dir_name)
safe_unpack16(&restore_plugin_crtype, buffer);
safe_unpack32(&restore_pstate_version, buffer);
+ if (restore_plugin_type == NULL)
+ goto unpack_error;
if ((strcmp(restore_plugin_type, plugin_type) != 0) ||
(restore_plugin_version != plugin_version) ||
(restore_plugin_crtype != cr_type) ||
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 02871653d25..0bcf403f384 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -1097,6 +1097,7 @@ extern int kill_running_job_by_node_name(char *node_name, bool step_test)
} else {
info("Killing job_id %u on failed node %s",
job_ptr->job_id, node_name);
+ srun_node_fail(job_ptr->job_id, node_name);
job_ptr->job_state = JOB_NODE_FAIL |
JOB_COMPLETING;
job_ptr->exit_code =
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index e6c73d45668..5a4d299c587 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1478,7 +1478,7 @@ static void _slurm_rpc_reconfigure_controller(slurm_msg_t * msg)
uid_t uid;
START_TIMER;
- debug2("Processing RPC: REQUEST_RECONFIGURE");
+ info("Processing RPC: REQUEST_RECONFIGURE");
uid = g_slurm_auth_get_uid(msg->auth_cred);
if (!validate_super_user(uid)) {
error("Security violation, RECONFIGURE RPC from uid=%u",
--
GitLab