X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Floadbalancer%2FLoadBalancer.php;h=1be8926bfa55042bdde924fd268db5db7024c7d8;hb=0f3226654343a78c4b58ba3f1032bc031ce7b8eb;hp=1665a5ef7d3982d34d0560a71bedb927c71bc2ae;hpb=a477016887afebba9d6cdbc916e29ea306d9ca85;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 1665a5ef7d..1be8926bfa 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -49,7 +49,7 @@ class LoadBalancer implements ILoadBalancer {
 	private $mGroupLoads;
 	/** @var bool Whether to disregard replica DB lag as a factor in replica DB selection */
 	private $mAllowLagged;
-	/** @var integer Seconds to spend waiting on replica DB lag to resolve */
+	/** @var int Seconds to spend waiting on replica DB lag to resolve */
 	private $mWaitTimeout;
 	/** @var array The LoadMonitor configuration */
 	private $loadMonitorConfig;
@@ -79,7 +79,7 @@ class LoadBalancer implements ILoadBalancer {
 
 	/** @var Database DB connection object that caused a problem */
 	private $errorConnection;
-	/** @var integer The generic (not query grouped) replica DB index (of $mServers) */
+	/** @var int The generic (not query grouped) replica DB index (of $mServers) */
 	private $mReadIndex;
 	/** @var bool|DBMasterPos False if not set */
 	private $mWaitForPos;
@@ -91,7 +91,7 @@ class LoadBalancer implements ILoadBalancer {
 	private $mLastError = 'Unknown error';
 	/** @var string|bool Reason the LB is read-only or false if not */
 	private $readOnlyReason = false;
-	/** @var integer Total connections opened */
+	/** @var int Total connections opened */
 	private $connsOpened = 0;
 	/** @var string|bool String if a requested DBO_TRX transaction round is active */
 	private $trxRoundId = false;
@@ -111,17 +111,17 @@ class LoadBalancer implements ILoadBalancer {
 	/** @var callable Exception logger */
 	private $errorLogger;
 
-	/** @var boolean */
+	/** @var bool */
 	private $disabled = false;
-	/** @var boolean */
+	/** @var bool */
 	private $chronProtInitialized = false;
 
-	/** @var integer Warn when this many connection are held */
+	/** @var int Warn when this many connection are held */
 	const CONN_HELD_WARN_THRESHOLD = 10;
 
-	/** @var integer Default 'max lag' when unspecified */
+	/** @var int Default 'max lag' when unspecified */
 	const MAX_LAG_DEFAULT = 10;
-	/** @var integer Seconds to cache master server read-only status */
+	/** @var int Seconds to cache master server read-only status */
 	const TTL_CACHE_READONLY = 5;
 
 	const KEY_LOCAL = 'local';
@@ -384,9 +384,9 @@ class LoadBalancer implements ILoadBalancer {
 			throw new InvalidArgumentException( "Empty server array given to LoadBalancer" );
 		}
 
-		/** @var $i int|bool Index of selected server */
+		/** @var int|bool $i Index of selected server */
 		$i = false;
-		/** @var $laggedReplicaMode bool Whether server is considered lagged */
+		/** @var bool $laggedReplicaMode Whether server is considered lagged */
 		$laggedReplicaMode = false;
 
 		// Quickly look through the available servers for a server that meets criteria...
@@ -538,7 +538,7 @@ class LoadBalancer implements ILoadBalancer {
 	public function getAnyOpenConnection( $i ) {
 		foreach ( $this->mConns as $connsByServer ) {
 			if ( !empty( $connsByServer[$i] ) ) {
-				/** @var $serverConns IDatabase[] */
+				/** @var IDatabase[] $serverConns */
 				$serverConns = $connsByServer[$i];
 
 				return reset( $serverConns );
@@ -568,7 +568,8 @@ class LoadBalancer implements ILoadBalancer {
 			$knownReachedPos->hasReached( $this->mWaitForPos )
 		) {
 			$this->replLogger->debug( __METHOD__ .
-				": replica DB $server known to be caught up (pos >= $knownReachedPos)." );
+				': replica DB {dbserver} known to be caught up (pos >= $knownReachedPos).',
+				[ 'dbserver' => $server ] );
 			return true;
 		}
 
@@ -576,13 +577,15 @@ class LoadBalancer implements ILoadBalancer {
 		$conn = $this->getAnyOpenConnection( $index );
 		if ( !$conn ) {
 			if ( !$open ) {
-				$this->replLogger->debug( __METHOD__ . ": no connection open for $server" );
+				$this->replLogger->debug( __METHOD__ . ': no connection open for {dbserver}',
+					[ 'dbserver' => $server ] );
 
 				return false;
 			} else {
 				$conn = $this->openConnection( $index, self::DOMAIN_ANY );
 				if ( !$conn ) {
-					$this->replLogger->warning( __METHOD__ . ": failed to connect to $server" );
+					$this->replLogger->warning( __METHOD__ . ': failed to connect to {dbserver}',
+						[ 'dbserver' => $server ] );
 
 					return false;
 				}
@@ -592,7 +595,8 @@ class LoadBalancer implements ILoadBalancer {
 			}
 		}
 
-		$this->replLogger->info( __METHOD__ . ": Waiting for replica DB $server to catch up..." );
+		$this->replLogger->info( __METHOD__ . ': Waiting for replica DB {dbserver} to catch up...',
+			[ 'dbserver' => $server ] );
 		$timeout = $timeout ?: $this->mWaitTimeout;
 		$result = $conn->masterPosWait( $this->mWaitForPos, $timeout );
 
@@ -845,7 +849,7 @@ class LoadBalancer implements ILoadBalancer {
 	 *
 	 * @param int $i Server index
 	 * @param string $domain Domain ID to open
-	 * @param integer $flags Class CONN_* constant bitfield
+	 * @param int $flags Class CONN_* constant bitfield
 	 * @return Database
 	 */
 	private function openForeignConnection( $i, $domain, $flags = 0 ) {