Merge "Lowered $maxAllowedLag to 3 in JobRunner"

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index d5262a1..85f9c2c 100644 (file)
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -123,8 +123,8 @@ class JobRunner implements LoggerAwareInterface {
                $trxProfiler->setExpectation( 'maxAffected', 500, __METHOD__ );
 
                // Bail out if there is too much DB lag
-               $maxAllowedLag = 5;
-               list( , $maxLag ) = wfGetLBFactory()->getMainLB( wfWikiID() )->getMaxLag();
+               $maxAllowedLag = 3;
+               list( , $maxLag ) = wfGetLB( wfWikiID() )->getMaxLag();
                if ( $maxLag >= $maxAllowedLag ) {
                        $response['reached'] = 'slave-lag-limit';
                        return $response;