From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 19 Oct 2014 01:11:53 +0000 (-0700)
Subject: Avoid calling recyclePruneAndUndelayJobs() in daemonized mode
X-Git-Tag: 1.31.0-rc.0~13557
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=015ad5d4030e553055d28d929743e49308fb459f;p=lhc%2Fweb%2Fwiklou.git

Avoid calling recyclePruneAndUndelayJobs() in daemonized mode

* This could cause problems if claimTTL is 0 in MW config but not
  in the runner JSON config.

Change-Id: I86418fd4426b58be1c17c97e026d14239f5e36de
---

diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index 3ac5cf4c3c..b87c678a36 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -295,7 +295,7 @@ LUA;
 
 		// Push ready delayed jobs into the queue every 10 jobs to spread the load.
 		// This is also done as a periodic task, but we don't want too much done at once.
-		if ( $this->checkDelay && mt_rand( 0, 9 ) == 0 ) {
+		if ( !$this->daemonized && $this->checkDelay && mt_rand( 0, 9 ) == 0 ) {
 			$this->recyclePruneAndUndelayJobs();
 		}