X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Floadbalancer%2FLoadBalancer.php;h=f41088251a791010718d565cd7a9160adb8e48bf;hp=ee3c86f1eea3823c8491ea06d2be929f2da09f19;hb=734aafcfbd49c2da176dd5f9d99cebc202f90bd6;hpb=5bf7087cefdb77daaefd7a488ae68cae60b3e406

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index ee3c86f1ee..f41088251a 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 = [
@@ -522,7 +526,7 @@ class LoadBalancer implements ILoadBalancer {
 			for ( $i = 1; $i < $serverCount; $i++ ) {
 				if ( $this->mLoads[$i] > 0 ) {
 					$start = microtime( true );
-					$ok = $this->doWait( $i, true, max( 1, (int)$timeout ) ) && $ok;
+					$ok = $this->doWait( $i, true, $timeout ) && $ok;
 					$timeout -= ( microtime( true ) - $start );
 					if ( $timeout <= 0 ) {
 						break; // timeout reached
@@ -575,7 +579,7 @@ class LoadBalancer implements ILoadBalancer {
 	 * @return bool
 	 */
 	protected function doWait( $index, $open = false, $timeout = null ) {
-		$close = false; // close the connection afterwards
+		$timeout = max( 1, $timeout ?: $this->mWaitTimeout );
 
 		// Check if we already know that the DB has reached this point
 		$server = $this->getServerName( $index );
@@ -586,25 +590,32 @@ class LoadBalancer implements ILoadBalancer {
 			$knownReachedPos instanceof DBMasterPos &&
 			$knownReachedPos->hasReached( $this->mWaitForPos )
 		) {
-			$this->replLogger->debug( __METHOD__ .
+			$this->replLogger->debug(
+				__METHOD__ .
 				': replica DB {dbserver} known to be caught up (pos >= $knownReachedPos).',
-				[ 'dbserver' => $server ] );
+				[ 'dbserver' => $server ]
+			);
 			return true;
 		}
 
 		// Find a connection to wait on, creating one if needed and allowed
+		$close = false; // close the connection afterwards
 		$conn = $this->getAnyOpenConnection( $index );
 		if ( !$conn ) {
 			if ( !$open ) {
-				$this->replLogger->debug( __METHOD__ . ': no connection open for {dbserver}',
-					[ 'dbserver' => $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 {dbserver}',
-						[ 'dbserver' => $server ] );
+					$this->replLogger->warning(
+						__METHOD__ . ': failed to connect to {dbserver}',
+						[ 'dbserver' => $server ]
+					);
 
 					return false;
 				}
@@ -614,16 +625,32 @@ class LoadBalancer implements ILoadBalancer {
 			}
 		}
 
-		$this->replLogger->info( __METHOD__ . ': Waiting for replica DB {dbserver} to catch up...',
-			[ 'dbserver' => $server ] );
-		$timeout = $timeout ?: $this->mWaitTimeout;
+		$this->replLogger->info(
+			__METHOD__ .
+			': Waiting for replica DB {dbserver} to catch up...',
+			[ 'dbserver' => $server ]
+		);
+
 		$result = $conn->masterPosWait( $this->mWaitForPos, $timeout );
 
-		if ( $result == -1 || is_null( $result ) ) {
-			// Timed out waiting for replica DB, use master instead
+		if ( $result === null ) {
+			$this->replLogger->warning(
+				__METHOD__ . ': Errored out waiting on {host} pos {pos}',
+				[
+					'host' => $server,
+					'pos' => $this->mWaitForPos,
+					'trace' => ( new RuntimeException() )->getTraceAsString()
+				]
+			);
+			$ok = false;
+		} elseif ( $result == -1 ) {
 			$this->replLogger->warning(
 				__METHOD__ . ': Timed out waiting on {host} pos {pos}',
-				[ 'host' => $server, 'pos' => $this->mWaitForPos ]
+				[
+					'host' => $server,
+					'pos' => $this->mWaitForPos,
+					'trace' => ( new RuntimeException() )->getTraceAsString()
+				]
 			);
 			$ok = false;
 		} else {
@@ -825,7 +852,7 @@ class LoadBalancer implements ILoadBalancer {
 					// Use the local domain table prefix if the local domain is specified
 					$server['tablePrefix'] = $this->localDomain->getTablePrefix();
 				}
-				$conn = $this->reallyOpenConnection( $server, $this->localDomain->getDatabase() );
+				$conn = $this->reallyOpenConnection( $server, $this->localDomain );
 				$host = $this->getServerName( $i );
 				if ( $conn->isOpen() ) {
 					$this->connLogger->debug( "Connected to database $i at '$host'." );
@@ -926,7 +953,7 @@ class LoadBalancer implements ILoadBalancer {
 			$server['foreignPoolRefCount'] = 0;
 			$server['foreign'] = true;
 			$server['autoCommitOnly'] = $autoCommit;
-			$conn = $this->reallyOpenConnection( $server, $dbName );
+			$conn = $this->reallyOpenConnection( $server, $domainInstance );
 			if ( !$conn->isOpen() ) {
 				$this->connLogger->warning( __METHOD__ . ": connection error for $i/$domain" );
 				$this->errorConnection = $conn;
@@ -969,18 +996,19 @@ class LoadBalancer implements ILoadBalancer {
 	 * Returns a Database object whether or not the connection was successful.
 	 *
 	 * @param array $server
-	 * @param string|null $dbNameOverride Use "" to not select any database
+	 * @param DatabaseDomain $domainOverride Use an unspecified domain to not select any database
 	 * @return Database
 	 * @throws DBAccessError
 	 * @throws InvalidArgumentException
 	 */
-	protected function reallyOpenConnection( array $server, $dbNameOverride ) {
+	protected function reallyOpenConnection( array $server, DatabaseDomain $domainOverride ) {
 		if ( $this->disabled ) {
 			throw new DBAccessError();
 		}
 
-		if ( $dbNameOverride !== null ) {
-			$server['dbname'] = $dbNameOverride;
+		if ( $domainOverride->getDatabase() !== null ) {
+			$server['dbname'] = $domainOverride->getDatabase();
+			$server['schema'] = $domainOverride->getSchema();
 		}
 
 		// Let the handle know what the cluster master is (e.g. "db1052")
@@ -1644,8 +1672,11 @@ class LoadBalancer implements ILoadBalancer {
 			$result = $conn->masterPosWait( $pos, $timeout );
 			if ( $result == -1 || is_null( $result ) ) {
 				$msg = __METHOD__ . ': Timed out waiting on {host} pos {pos}';
-				$this->replLogger->warning( $msg,
-					[ 'host' => $conn->getServer(), 'pos' => $pos ] );
+				$this->replLogger->warning( $msg, [
+					'host' => $conn->getServer(),
+					'pos' => $pos,
+					'trace' => ( new RuntimeException() )->getTraceAsString()
+				] );
 				$ok = false;
 			} else {
 				$this->replLogger->info( __METHOD__ . ': Done' );
@@ -1653,8 +1684,13 @@ class LoadBalancer implements ILoadBalancer {
 			}
 		} else {
 			$ok = false; // something is misconfigured
-			$this->replLogger->error( 'Could not get master pos for {host}',
-				[ 'host' => $conn->getServer() ] );
+			$this->replLogger->error(
+				__METHOD__ . ': could not get master pos for {host}',
+				[
+					'host' => $conn->getServer(),
+					'trace' => ( new RuntimeException() )->getTraceAsString()
+				]
+			);
 		}
 
 		return $ok;
@@ -1698,7 +1734,7 @@ class LoadBalancer implements ILoadBalancer {
 		$oldDomain = $this->localDomain->getId();
 		$this->setLocalDomain( new DatabaseDomain(
 			$this->localDomain->getDatabase(),
-			null,
+			$this->localDomain->getSchema(),
 			$prefix
 		) );