Fix bug in job completion error logging.

src/slurmctld/proc_req.c

@@ -877,7 +877,8 @@ static void _slurm_rpc_job_step_complete(slurm_msg_t * msg)
 		complete_job_step_msg->slurm_rc = SLURM_SUCCESS;
 	}
 	if (complete_job_step_msg->slurm_rc != SLURM_SUCCESS) {
-		error("Fatal slurmd error running JobId=%u from node=%s: %s",
+		error("Fatal slurmd error %u running JobId=%u on node=%s: %s",
+		      complete_job_step_msg->slurm_rc,
 		      complete_job_step_msg->job_id,
 		      complete_job_step_msg->node_name,
 		      slurm_strerror(complete_job_step_msg->slurm_rc));

src/slurmd/mgr.c

@@ -1088,7 +1088,7 @@ _complete_job(uint32_t jobid, int err, int status)
 	slurm_msg_t              req_msg;
 	complete_job_step_msg_t  req;
 
-	req.job_id	    = jobid;
+	req.job_id	= jobid;
 	req.job_step_id	= NO_VAL; 
 	req.job_rc      = status;
 	req.slurm_rc	= err; 

src/srun/job.c

@@ -336,10 +336,10 @@ job_destroy(job_t *job, int error)
 	if (job->old_job) {
 		debug("cancelling job step %u.%u", job->jobid, job->stepid);
 		slurm_kill_job_step(job->jobid, job->stepid, SIGKILL);
-		slurm_complete_job_step(job->jobid, job->stepid, 0, error);
+		slurm_complete_job_step(job->jobid, job->stepid, error, 0);
 	} else if (!opt.no_alloc) {
 		debug("cancelling job %u", job->jobid);
-		slurm_complete_job(job->jobid, 0, error);
+		slurm_complete_job(job->jobid, error, 0);
 	} else {
 		debug("no allocation to cancel, killing remote tasks");
 		fwd_signal(job, SIGKILL);