From 2607ba2b896b338441495be085df59f6bb98c63e Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 21 Oct 2014 14:41:34 -0700
Subject: [PATCH] Made JobRunner wait for all applicable slaves, not just the
 main cluster

Change-Id: Ib610684fd3d9b76ea13fe585a290983c071b88f4
---
 includes/jobqueue/JobRunner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 					}
-- 
2.20.1