From e2c75bb3bda90d091557ef250785cd3b89617201 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 21 May 2016 03:40:03 -0700 Subject: [PATCH] Do not count 0-load servers in getMaxLag() JobRunner::run() and API endpoints use this to bail out if lag is too high. A dedicated "vslow" host with no normal load should not trigger this logic, for example. Bug: T135809 Change-Id: If6879aa1a4379857779a4eacf2a8b7400c0b434f --- includes/db/loadbalancer/LoadBalancer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php index 557809905c..1f2f494d53 100644 --- a/includes/db/loadbalancer/LoadBalancer.php +++ b/includes/db/loadbalancer/LoadBalancer.php @@ -1334,7 +1334,7 @@ class LoadBalancer { $lagTimes = $this->getLagTimes( $wiki ); foreach ( $lagTimes as $i => $lag ) { - if ( $lag > $maxLag ) { + if ( $this->mLoads[$i] > 0 && $lag > $maxLag ) { $maxLag = $lag; $host = $this->mServers[$i]['host']; $maxIndex = $i; -- 2.20.1