Skip to content
Snippets Groups Projects
Commit 974b88a5 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

[backend] Minor fixes to model functionality

parent aab99cb0
No related branches found
No related tags found
1 merge request!194Scheduler
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
############################################################################### ###############################################################################
import datetime import datetime
import operator
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
...@@ -327,14 +328,20 @@ class Queue(models.Model): ...@@ -327,14 +328,20 @@ class Queue(models.Model):
''' '''
workers = [(k.worker, -k.priority, k.worker.load(), k.worker.hostname) \ workers = [(k.worker, -k.priority, k.worker.load(), k.worker.name) \
for k in self.slots if k.worker.active] for k in self.slots.filter(worker__active=True)]
workers = sorted(workers, key=operator.itemgetter(1,2,3)) workers = sorted(workers, key=operator.itemgetter(1,2,3))
return [w[0] for w in workers] return [w[0] for w in workers]
def splits(self):
'''Lists all job splits currently associated to this queue'''
return JobSplit.objects.filter(job__block__queue=self)
def as_dict(self): def as_dict(self):
'''Returns a representation as a dictionary''' '''Returns a representation as a dictionary'''
......
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