From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 10 Feb 2014 22:37:42 +0000 (-0800)
Subject: Avoid fatal error in LoadBalancer when all servers are busy
X-Git-Tag: 1.31.0-rc.0~16961
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=56b22fbea8cdd6fcd31c94e6b4bb01be49fa9683;p=lhc%2Fweb%2Fwiklou.git

Avoid fatal error in LoadBalancer when all servers are busy

* Fixes bug from b3c9653

Change-Id: Ida22f0ee3e97f98e4a1de6f7260a9a9f8aa08a39
---

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index e35c4c4903..07f8ee923d 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -262,6 +262,7 @@ class LoadBalancer {
 
 			$conn = $this->openConnection( $i, $wiki );
 			if ( !$conn ) {
+				$i = false;
 				wfDebugLog( 'connect', __METHOD__ . ": Failed connecting to $i/$wiki" );
 				unset( $nonErrorLoads[$i] );
 				unset( $currentLoads[$i] );