Rooba
/
rq
mirror of https://github.com/rq/rq.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't enqueue waitlisted jobs on failed execution.

This commit is contained in:
Selwin Ong 2013-04-18 22:18:56 +07:00
parent eadc7db29f
commit 6550f86646
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rq/queue.py
View File

@ -113,7 +113,7 @@ class Queue(object):
"""Pushes a job ID on the corresponding Redis queue."""
self.connection.rpush(self.key, job_id)
def enqueue_call(self, func, args=None, kwargs=None, timeout=None,
def enqueue_call(self, func, args=None, kwargs=None, timeout=None,
result_ttl=None, after=None):
"""Creates a job to represent the delayed function call and enqueues
it.
@ -123,6 +123,7 @@ class Queue(object):
contain options for RQ itself.
"""
timeout = timeout or self._default_timeout
# TODO: job with dependency shouldn't have "queued" as status
job = Job.create(func, args, kwargs, connection=self.connection,
result_ttl=result_ttl, status=Status.QUEUED,
parent=after)

3
rq/worker.py
View File

@ -328,7 +328,8 @@ class Worker(object):
self.connection.expire(self.key, (job.timeout or 180) + 60)
self.fork_and_perform_job(job)
self.connection.expire(self.key, self.default_worker_ttl)
queue.enqueue_waitlist(job)
if job.status == 'finished':
queue.enqueue_waitlist(job)
did_perform_work = True
finally:

9
tests/test_worker.py
View File

@ -236,10 +236,17 @@ class TestWorker(RQTestCase):
self.assertEqual(job.is_failed, True)
def test_job_dependency(self):
"""Waitlisted jobs are enqueued only if their parents don't fail"""
q = Queue()
w = Worker([q])
parent_job = q.enqueue(say_hello)
job = q.enqueue_call(say_hello, after=parent_job)
w.work(burst=True)
job = Job.fetch(job.id)
self.assertEqual(job.status, 'finished')
self.assertEqual(job.status, 'finished')
parent_job = q.enqueue(div_by_zero)
job = q.enqueue_call(say_hello, after=parent_job)
w.work(burst=True)
job = Job.fetch(job.id)
self.assertNotEqual(job.status, 'finished')