From 21b1f3706c5a20db50881bfc927b55a480f16b57 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 11 Apr 2006 16:57:51 +0000
Subject: [PATCH] minor fix for non bluegene systems
---
src/plugins/jobacct/common/common_slurmctld.c | 2 --
src/slurmctld/proc_req.c | 7 ++++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/plugins/jobacct/common/common_slurmctld.c b/src/plugins/jobacct/common/common_slurmctld.c
index 17b23c54633..23707be2ccd 100644
--- a/src/plugins/jobacct/common/common_slurmctld.c
+++ b/src/plugins/jobacct/common/common_slurmctld.c
@@ -251,7 +251,6 @@ extern int common_step_start_slurmctld(struct step_record *step)
#else
cpus = step->num_cpus;
snprintf(node_list, BUFFER_SIZE, "%s", step->step_node_list);
- block_id = xstrdup("-");
#endif
snprintf(buf, BUFFER_SIZE, _jobstep_format,
JOB_STEP,
@@ -338,7 +337,6 @@ extern int common_step_complete_slurmctld(struct step_record *step)
#else
cpus = step->num_cpus;
snprintf(node_list, BUFFER_SIZE, "%s", step->step_node_list);
- block_id = xstrdup("-");
#endif
snprintf(buf, BUFFER_SIZE, _jobstep_format,
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 72f02dae367..e4602943a34 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1558,8 +1558,9 @@ static void _slurm_rpc_shutdown_controller_immediate(slurm_msg_t * msg)
debug("Performing RPC: REQUEST_SHUTDOWN_IMMEDIATE");
}
-/* _slurm_rpc_step_complete - process step completion RPC to note the completion of
- * a job step on at least some nodes. If the job step is complete, it may
+/* _slurm_rpc_step_complete - process step completion RPC to note the
+ * completion of a job step on at least some nodes.
+ * If the job step is complete, it may
* represent the termination of an entire job */
static void _slurm_rpc_step_complete(slurm_msg_t *msg)
{
@@ -1604,7 +1605,7 @@ static void _slurm_rpc_step_complete(slurm_msg_t *msg)
if (req->job_step_id == SLURM_BATCH_SCRIPT) {
/* FIXME: test for error, possibly cause batch job requeue */
error_code = job_complete(req->job_id, uid, job_requeue,
- step_rc);
+ step_rc);
unlock_slurmctld(job_write_lock);
END_TIMER;
--
GitLab