From 6379105318961878b7bbe6c4486d0a68982ffe76 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 9 Dec 2011 09:36:35 -0800
Subject: [PATCH] Fixed issue with QOS preemption when adding new QOS.
---
NEWS | 3 ++-
src/plugins/accounting_storage/mysql/as_mysql_qos.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 63f6834319d..96ec312c56b 100644
--- a/NEWS
+++ b/NEWS
@@ -108,7 +108,8 @@ documents those changes that are of interest to users and admins.
modified to permit the partition limit to be exceeded. Patch from Bill
Brophy, Bull.
-- BLUEGENE - Fixed preemption issue.
- -- sacct search for jobs using filtering was ignoring wckey filter.
+ -- sacct search for jobs using filtering was ignoring wckey filter.
+ -- Fixed issue with QOS preemption when adding new QOS.
* Changes in SLURM 2.3.2
========================
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_qos.c b/src/plugins/accounting_storage/mysql/as_mysql_qos.c
index b7b71509865..3102e90b84a 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_qos.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_qos.c
@@ -92,6 +92,8 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->description = xstrdup("");
if (qos->flags & QOS_FLAG_NOTSET)
qos->flags = 0;
+ if (qos->grace_time == NO_VAL)
+ qos->grace_time = 0;
if (qos->grp_cpu_mins == (uint64_t)NO_VAL)
qos->grp_cpu_mins = (uint64_t)INFINITE;
if (qos->grp_cpu_run_mins == (uint64_t)NO_VAL)
@@ -1115,8 +1117,6 @@ empty:
if (row[QOS_REQ_GRACE])
qos->grace_time = slurm_atoul(row[QOS_REQ_GRACE]);
- else
- qos->grace_time = (uint32_t)NO_VAL;
if (row[QOS_REQ_GCM])
qos->grp_cpu_mins = slurm_atoull(row[QOS_REQ_GCM]);
--
GitLab