From cd17d17d71425cb75e887f3815cb5502d9a613e8 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Sun, 13 Feb 2022 10:15:07 +0100 Subject: [PATCH] rq.worker: remove useless set_state call in horse (#1618) * rq.worker: remove useless set_state call in horse The state should already have been set properly by the worker in `execute_job` `prepare_job_execution` is only called by `perform_job` which should only be called by `main_work_horse`/`fork_work_horse` (themselves only called by `execute_job`). Let `execute_job` do the bookkeeping. * worker: update SimpleWorker's state in execute_job --- rq/worker.py | 5 +++-- tests/test_worker.py | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rq/worker.py b/rq/worker.py index cac6bdb..7bed707 100644 --- a/rq/worker.py +++ b/rq/worker.py @@ -922,7 +922,6 @@ class Worker: """ with self.connection.pipeline() as pipeline: - self.set_state(WorkerStatus.BUSY, pipeline=pipeline) self.set_current_job_id(job.id, pipeline=pipeline) self.set_current_job_working_time(0, pipeline=pipeline) @@ -1195,7 +1194,9 @@ class SimpleWorker(Worker): def execute_job(self, job, queue): """Execute job in same thread/process, do not fork()""" - return self.perform_job(job, queue) + self.set_state(WorkerStatus.BUSY) + self.perform_job(job, queue) + self.set_state(WorkerStatus.IDLE) def get_heartbeat_ttl(self, job): # "-1" means that jobs never timeout. In this case, we should _not_ do -1 + 60 = 59. diff --git a/tests/test_worker.py b/tests/test_worker.py index 0e944c2..3f865a2 100644 --- a/tests/test_worker.py +++ b/tests/test_worker.py @@ -797,8 +797,7 @@ class TestWorker(RQTestCase): registry = StartedJobRegistry(connection=self.testconn) self.assertEqual(registry.get_job_ids(), [job.id]) - # Updates worker statuses - self.assertEqual(worker.get_state(), 'busy') + # Updates worker's current job self.assertEqual(worker.get_current_job_id(), job.id) # job status is also updated