From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 3 Feb 2018 03:30:48 +0000 (-0800)
Subject: rdbms: turn LoadBalancer waitTimeout default into a class constant
X-Git-Tag: 1.31.0-rc.0~706^2
X-Git-Url: http://git.cyclocoop.org/wiki/%7B%7Bpath%7D%7Dmw-config/index.php?a=commitdiff_plain;h=8a604b68b0496e5c31acacc7f44d02bb322e5d96;p=lhc%2Fweb%2Fwiklou.git

rdbms: turn LoadBalancer waitTimeout default into a class constant

Change-Id: Icd1e1aba1c45cb79a8249a9e16dce16f1c8183d2
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 864e6f0a3c..a3361cd9b7 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -122,6 +122,8 @@ class LoadBalancer implements ILoadBalancer {
 
 	/** @var int Default 'maxLag' when unspecified */
 	const MAX_LAG_DEFAULT = 10;
+	/** @var int Default 'waitTimeout' when unspecified */
+	const MAX_WAIT_DEFAULT = 10;
 	/** @var int Seconds to cache master server read-only status */
 	const TTL_CACHE_READONLY = 5;
 
@@ -151,7 +153,9 @@ class LoadBalancer implements ILoadBalancer {
 			: DatabaseDomain::newUnspecified();
 		$this->setLocalDomain( $localDomain );
 
-		$this->mWaitTimeout = isset( $params['waitTimeout'] ) ? $params['waitTimeout'] : 10;
+		$this->mWaitTimeout = isset( $params['waitTimeout'] )
+			? $params['waitTimeout']
+			: self::MAX_WAIT_DEFAULT;
 
 		$this->mReadIndex = -1;
 		$this->mConns = [