From be44f2eda9c27ce63ec860f5db1a61bb6c8fb9c2 Mon Sep 17 00:00:00 2001
From: Carles Fenoy <carles.fenoy@bsc.es>
Date: Tue, 4 Dec 2012 12:54:39 +0100
Subject: [PATCH] Added check for preeption mode before changing time limit to
 1 if flag no reserve is enabled, as this can cause a problem with jobs
 starting on nodes with future reservations.

---
 src/plugins/sched/backfill/backfill.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index f210b57cf49..77c6530ae49 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -693,7 +693,7 @@ static int _attempt_backfill(void)
 		comp_time_limit = time_limit;
 		orig_time_limit = job_ptr->time_limit;
 		qos_ptr = job_ptr->qos_ptr;
-		if (qos_ptr && (qos_ptr->flags & QOS_FLAG_NO_RESERVE))
+		if (qos_ptr && (qos_ptr->flags & QOS_FLAG_NO_RESERVE) && slurm_get_preempt_mode())
 			time_limit = job_ptr->time_limit = 1;
 		else if (job_ptr->time_min && (job_ptr->time_min < time_limit))
 			time_limit = job_ptr->time_limit = job_ptr->time_min;
-- 
GitLab