dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assign_task takes better care for group_names, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro
2012-10-21 09:23:26 -05:00
parent e9eb1689e2
commit 1cc2decfdd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.1.1 (2012-10-20 19:38:48) dev Version 2.1.1 (2012-10-21 09:23:20) dev
gluon/scheduler.py
+2 -2
View File
@@ -789,7 +789,7 @@ class Scheduler(MetaScheduler):
db(st.status.belongs( db(st.status.belongs(
(QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED) (QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED)
all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time is None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True) all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time == None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True)
limit = len(all_workers) * (50 / len(wkgroups)) limit = len(all_workers) * (50 / len(wkgroups))
#if there are a moltitude of tasks, let's figure out a maximum of tasks per worker. #if there are a moltitude of tasks, let's figure out a maximum of tasks per worker.
#this can be adjusted with some added intelligence (like esteeming how many tasks will #this can be adjusted with some added intelligence (like esteeming how many tasks will
@@ -805,7 +805,7 @@ class Scheduler(MetaScheduler):
#let's freeze it up #let's freeze it up
db.commit() db.commit()
for group in wkgroups.keys(): for group in wkgroups.keys():
tasks = all_available(st.group_name == group).select( tasks = all_available(st.group_name==group).select(
limitby=(0, limit), orderby=st.next_run_time) limitby=(0, limit), orderby=st.next_run_time)
#let's break up the queue evenly among workers #let's break up the queue evenly among workers
for task in tasks: for task in tasks: