From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 20 Sep 2008 08:40:39 +0000 (+0000)
Subject: Use normal, more patient, connection attempts for master connection here
X-Git-Tag: 1.31.0-rc.0~45198
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=a6242f04d02d1cc99e055b742c22c2b41d79fbe3;p=lhc%2Fweb%2Fwiklou.git

Use normal, more patient, connection attempts for master connection here
---

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index 84d44a4018..fb3853ae3b 100644
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -41,9 +41,7 @@ class ExternalStoreDB {
 	/** @todo Document.*/
 	function &getMaster( $cluster, $retry = true ) {
 		$lb =& $this->getLoadBalancer( $cluster );
-		// Make only two connection attempts if there are other clusters to try
-		$attempts = $retry ? false : 2;
-		return $lb->getConnection( DB_MASTER, array(), false, $attempts, LoadBalancer::GRACEFUL );
+		return $lb->getConnection( DB_MASTER, array(), false, false, LoadBalancer::GRACEFUL );
 	}
 
 	/** @todo Document.*/