From d8ec0cbe31d6f2f18649890057e3ad3f6834cf42 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 22 Apr 2016 17:08:55 +0200
Subject: [PATCH] [backend] Fixes to the scheduling routines
---
beat/web/backend/schedule.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/beat/web/backend/schedule.py b/beat/web/backend/schedule.py
index 6abdaa3ba..dd3c0e097 100644
--- a/beat/web/backend/schedule.py
+++ b/beat/web/backend/schedule.py
@@ -66,8 +66,8 @@ def _select_splits_for_queue(queue):
'''
- splits = JobSplits.objects.filter(job__block__queue=queue,
- job__split_error=0, status=Job.QUEUED).order_by('job__runnable_date')
+ splits = JobSplit.objects.filter(job__block__queue=queue,
+ job__split_errors=0, status=Job.QUEUED).order_by('job__runnable_date')
# lists of all users currently running
users = set(splits.values_list('job__block__experiment__author', flat=True))
@@ -82,9 +82,9 @@ def _select_splits_for_queue(queue):
# limit runnable splits so we reach a maximum of allowed user slots
splits_to_consider = []
for s in splits:
- author = j.job.block.experiment.author
+ author = s.job.block.experiment.author.id
if allowance[author] > 0:
- splits_to_consider.append(j)
+ splits_to_consider.append(s)
allowance[author] -= 1
# TODO: Sort splits taking into consideration current user load
@@ -190,7 +190,7 @@ def schedule():
','.join([k.name for k in sorted_queues]))
splits_to_consider = \
- [self._select_splits_for_queue(q) for q in sorted_queues]
+ [_select_splits_for_queue(q) for q in sorted_queues]
# decides which split to run considering the 'on-the-fly' availability
--
GitLab