From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 21 Oct 2014 21:41:34 +0000 (-0700)
Subject: Made JobRunner wait for all applicable slaves, not just the main cluster
X-Git-Tag: 1.31.0-rc.0~13516^2
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=2607ba2b896b338441495be085df59f6bb98c63e;p=lhc%2Fweb%2Fwiklou.git

Made JobRunner wait for all applicable slaves, not just the main cluster

Change-Id: Ib610684fd3d9b76ea13fe585a290983c071b88f4
---

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 4d2c618dec..6b1934038e 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -186,7 +186,7 @@ class JobRunner {
 				// other wikis in the farm (on different masters) get a chance.
 				$timePassed = microtime( true ) - $lastTime;
 				if ( $timePassed >= 5 || $timePassed < 0 ) {
-					if ( !wfWaitForSlaves( $lastTime, wfWikiID(), false, 5 ) ) {
+					if ( !wfWaitForSlaves( $lastTime, false, '*', 5 ) ) {
 						$response['reached'] = 'slave-lag-limit';
 						break;
 					}