From e9f29660a8891d536726f926650eaeb71d3c80e3 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Sat, 27 Nov 2010 22:39:56 +0000 Subject: [PATCH] Fix bug in load balancer: filter out non-replicating slaves (or slaves otherwise not reporting their lag) even if no max lag is specified --- includes/db/LoadBalancer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index 797c391edb..355ed9250d 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -120,11 +120,11 @@ class LoadBalancer { # Unset excessively lagged servers $lags = $this->getLagTimes( $wiki ); foreach ( $lags as $i => $lag ) { - if ( $i != 0 && isset( $this->mServers[$i]['max lag'] ) ) { + if ( $i != 0 ) { if ( $lag === false ) { wfDebug( "Server #$i is not replicating\n" ); unset( $loads[$i] ); - } elseif ( $lag > $this->mServers[$i]['max lag'] ) { + } elseif ( isset( $this->mServers[$i]['max lag'] ) && $lag > $this->mServers[$i]['max lag'] ) { wfDebug( "Server #$i is excessively lagged ($lag seconds)\n" ); unset( $loads[$i] ); } -- 2.20.1