Skip to content
Snippets Groups Projects
Commit bd8042e8 authored by Danny Auble's avatar Danny Auble
Browse files

MYSQL - Make the error message more specific when removing a reservation

and it doesn't meet basic requirements.
parent 3affa60f
No related branches found
No related tags found
No related merge requests found
......@@ -10,6 +10,8 @@ documents those changes that are of interest to users and administrators.
jobs.
-- Reset job's prolog_running counter on slurmctld restart or reconfigure.
-- burst_buffer/cray - Update job's prolog_running counter if pre_run fails.
-- MYSQL - Make the error message more specific when removing a reservation
and it doesn't meet basic requirements.
* Changes in Slurm 15.08.10
===========================
......
......@@ -461,9 +461,18 @@ extern int as_mysql_remove_resv(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
}
if (!resv->id || !resv->time_start || !resv->cluster) {
error("Need an id, start time, and cluster "
"name to remove a reservation.");
if (!resv->id) {
error("An id is needed to remove a reservation.");
return SLURM_ERROR;
}
if (!resv->time_start) {
error("A start time is needed to remove a reservation.");
return SLURM_ERROR;
}
if (!resv->cluster || !resv->cluster[0]) {
error("A cluster name is needed to remove a reservation.");
return SLURM_ERROR;
}
......
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