Skip to content
Snippets Groups Projects
Commit 211abaee authored by Moe Jette's avatar Moe Jette
Browse files

Avoid slurmd abort if job timeout request generates an error after

setting the reply filel descriptor to -1 (seen in Blue Gene/L testing).
parent 539c9fd3
No related branches found
No related tags found
No related merge requests found
......@@ -943,7 +943,8 @@ _rpc_kill_job(slurm_msg_t *msg, slurm_addr *cli)
if (!_slurm_authorized_user(uid)) {
error("Security violation: kill_job(%ld) from uid %ld",
req->job_id, (long) uid);
slurm_send_rc_msg(msg, ESLURM_USER_ID_MISSING);
if (msg->conn_fd >= 0)
slurm_send_rc_msg(msg, ESLURM_USER_ID_MISSING);
return;
}
......@@ -955,7 +956,8 @@ _rpc_kill_job(slurm_msg_t *msg, slurm_addr *cli)
* then exit this thread.
*/
if (_waiter_init (req->job_id) < 0) {
slurm_send_rc_msg (msg, SLURM_SUCCESS);
if (msg->conn_fd >= 0)
slurm_send_rc_msg (msg, SLURM_SUCCESS);
return;
}
......@@ -979,7 +981,9 @@ _rpc_kill_job(slurm_msg_t *msg, slurm_addr *cli)
* request.
*/
if ((nsteps == 0) && !conf->epilog && (msg->conn_fd >= 0)) {
slurm_send_rc_msg(msg, ESLURMD_KILL_JOB_ALREADY_COMPLETE);
if (msg->conn_fd >= 0)
slurm_send_rc_msg(msg,
ESLURMD_KILL_JOB_ALREADY_COMPLETE);
slurm_cred_begin_expiration(conf->vctx, req->job_id);
_waiter_complete(req->job_id);
return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment