From e98c2bc4bfa272549eba3fab866043697a9912fc Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 15 Jul 2009 14:39:31 +0000
Subject: [PATCH] minor correction in logic to avoid over-subscribing memory
with job preemption
---
src/plugins/select/linear/select_linear.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index fcfdd09fc3c..2e667c403e8 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -581,11 +581,9 @@ static int _job_count_bitmap(struct node_cr_record *node_cr_ptr,
* allocated memory would exceed that available
* and there are *any* jobs left on the node after
* this one is started. */
- if (((alloc_mem + job_mem) >avail_mem) &&
- ((_job_preemption_killing() &&
- (same_prio_jobs > 0)) ||
- (!_job_preemption_killing() &&
- ((same_prio_jobs + lower_prio_jobs) > 0)))) {
+ if (((alloc_mem + job_mem) > avail_mem) &&
+ ((!_job_preemption_killing()) ||
+ ((same_prio_jobs + higher_prio_jobs) > 0))) {
bit_clear(jobmap, i);
continue;
}
--
GitLab