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

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 4d2c618..6b19340 100644 (file)
--- 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;
                                        }