fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-04 10:28:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213 from yannpom/master

Browse Source 
fix a race condition in orm broker
This commit is contained in:
Ilan Steemers
2016-12-05 20:46:02 +01:00
committed by GitHub
parent 82c48cd1c2 bbd2e82fd4
commit 571676e59c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/brokers/orm.py
+3 -4
View File
@@ -54,11 +54,10 @@ class ORM(Broker):
tasks = self.get_connection().filter(key=self.list_key, lock__lt=_timeout())[0:Conf.BULK] tasks = self.get_connection().filter(key=self.list_key, lock__lt=_timeout())[0:Conf.BULK]
if tasks: if tasks:
task_list = [] task_list = []
lock = timezone.now()
for task in tasks: for task in tasks:
task.lock = lock if self.get_connection().filter(id=task.id, lock=task.lock).update(lock=timezone.now()):
task.save(update_fields=['lock']) task_list.append((task.pk, task.payload))
task_list.append((task.pk, task.payload)) # else don't process, as another cluster has been faster than us on that task
return task_list return task_list
# empty queue, spare the cpu # empty queue, spare the cpu
sleep(Conf.POLL) sleep(Conf.POLL)