Fix broken pipeline / transaction (#1715)

Co-authored-by: Jan Rüegg <jrueegg@apple.com>
3 years ago · 4750eb4316
parent 375ace1747
commit 4750eb4316
1 changed files with 6 additions and 1 deletions
--- a/rq/worker.py
+++ b/rq/worker.py
@ -1027,9 +1027,14 @@ class Worker:
                    # if dependencies are inserted after enqueue_dependents
                    # a WatchError is thrown by execute()
                    pipeline.watch(job.dependents_key)
-                    # enqueue_dependents calls multi() on the pipeline!
+                    # enqueue_dependents might call multi() on the pipeline
                    queue.enqueue_dependents(job, pipeline=pipeline)

+                    if not pipeline.explicit_transaction:
+                        # enqueue_dependents didn't call multi after all!
+                        # We have to do it ourselves to make sure everything runs in a transaction
+                        pipeline.multi()
+
                    self.set_current_job_id(None, pipeline=pipeline)
                    self.increment_successful_job_count(pipeline=pipeline)
                    self.increment_total_working_time(