updated to MediaWiki 1.14.0

1 files changed, 37 insertions, 40 deletions

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 42c4044d..f847fe22 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -13,7 +13,7 @@
 class LoadBalancer {
 	/* private */ var $mServers, $mConns, $mLoads, $mGroupLoads;
 	/* private */ var $mFailFunction, $mErrorConnection;
-	/* private */ var $mReadIndex, $mLastIndex, $mAllowLagged;
+	/* private */ var $mReadIndex, $mAllowLagged;
 	/* private */ var $mWaitForPos, $mWaitTimeout;
 	/* private */ var $mLaggedSlaveMode, $mLastError = 'Unknown error';
 	/* private */ var $mParentInfo, $mLagTimes;
@@ -50,7 +50,6 @@ class LoadBalancer {
 			'local' => array(),
 			'foreignUsed' => array(),
 			'foreignFree' => array() );
-		$this->mLastIndex = -1;
 		$this->mLoads = array();
 		$this->mWaitForPos = false;
 		$this->mLaggedSlaveMode = false;
@@ -399,11 +398,20 @@ class LoadBalancer {
 	/**
 	 * Get a connection by index
 	 * This is the main entry point for this class.
+	 * @param int $i Database
+	 * @param array $groups Query groups
+	 * @param string $wiki Wiki ID
 	 */
 	public function &getConnection( $i, $groups = array(), $wiki = false ) {
 		global $wgDBtype;
 		wfProfileIn( __METHOD__ );
 
+		if ( $i == DB_LAST ) {
+			throw new MWException( 'Attempt to call ' . __METHOD__ . ' with deprecated server index DB_LAST' );
+		} elseif ( $i === null || $i === false ) {
+			throw new MWException( 'Attempt to call ' . __METHOD__ . ' with invalid server index' );
+		}
+
 		if ( $wiki === wfWikiID() ) {
 			$wiki = false;
 		}
@@ -433,19 +441,13 @@ class LoadBalancer {
 		# Operation-based index
 		if ( $i == DB_SLAVE ) {
 			$i = $this->getReaderIndex( false, $wiki );
-		} elseif ( $i == DB_LAST ) {
-			# Just use $this->mLastIndex, which should already be set
-			$i = $this->mLastIndex;
-			if ( $i === -1 ) {
-				# Oh dear, not set, best to use the writer for safety
-				wfDebug( "Warning: DB_LAST used when there was no previous index\n" );
-				$i = $this->getWriterIndex();
+			# Couldn't find a working server in getReaderIndex()?
+			if ( $i === false ) {
+				$this->mLastError = 'No working slave server: ' . $this->mLastError;
+				$this->reportConnectionError( $this->mErrorConnection );
+				return false;
 			}
 		}
-		# Couldn't find a working server in getReaderIndex()?
-		if ( $i === false ) {
-			$this->reportConnectionError( $this->mErrorConnection );
-		}
 
 		# Now we have an explicit index into the servers array
 		$conn = $this->openConnection( $i, $wiki );
@@ -525,7 +527,7 @@ class LoadBalancer {
 		} else {
 			$server = $this->mServers[$i];
 			$server['serverIndex'] = $i;
-			$conn = $this->reallyOpenConnection( $server );
+			$conn = $this->reallyOpenConnection( $server, false );
 			if ( $conn->isOpen() ) {
 				$this->mConns['local'][$i][0] = $conn;
 			} else {
@@ -534,7 +536,6 @@ class LoadBalancer {
 				$conn = false;
 			}
 		}
-		$this->mLastIndex = $i;
 		wfProfileOut( __METHOD__ );
 		return $conn;
 	}
@@ -576,9 +577,8 @@ class LoadBalancer {
 			$oldWiki = key( $this->mConns['foreignFree'][$i] );
 
 			if ( !$conn->selectDB( $dbName ) ) {
-				global $wguname;
 				$this->mLastError = "Error selecting database $dbName on server " .
-					$conn->getServer() . " from client host {$wguname['nodename']}\n";
+					$conn->getServer() . " from client host " . wfHostname() . "\n";
 				$this->mErrorConnection = $conn;
 				$conn = false;
 			} else {
@@ -598,6 +598,7 @@ class LoadBalancer {
 				$this->mErrorConnection = $conn;
 				$conn = false;
 			} else {
+				$conn->tablePrefix( $prefix );
 				$this->mConns['foreignUsed'][$i][$wiki] = $conn;
 				wfDebug( __METHOD__.": opened new connection for $i/$wiki\n" );
 			}
@@ -661,31 +662,27 @@ class LoadBalancer {
 
 	function reportConnectionError( &$conn ) {
 		wfProfileIn( __METHOD__ );
-		# Prevent infinite recursion
-
-		static $reporting = false;
-		if ( !$reporting ) {
-			$reporting = true;
-			if ( !is_object( $conn ) ) {
-				// No last connection, probably due to all servers being too busy
-				$conn = new Database;
-				if ( $this->mFailFunction ) {
-					$conn->failFunction( $this->mFailFunction );
-					$conn->reportConnectionError( $this->mLastError );
-				} else {
-					// If all servers were busy, mLastError will contain something sensible
-					throw new DBConnectionError( $conn, $this->mLastError );
-				}
+
+		if ( !is_object( $conn ) ) {
+			// No last connection, probably due to all servers being too busy
+			wfLogDBError( "LB failure with no last connection\n" );
+			$conn = new Database;
+			if ( $this->mFailFunction ) {
+				$conn->failFunction( $this->mFailFunction );
+				$conn->reportConnectionError( $this->mLastError );
 			} else {
-				if ( $this->mFailFunction ) {
-					$conn->failFunction( $this->mFailFunction );
-				} else {
-					$conn->failFunction( false );
-				}
-				$server = $conn->getProperty( 'mServer' );
-				$conn->reportConnectionError( "{$this->mLastError} ({$server})" );
+				// If all servers were busy, mLastError will contain something sensible
+				throw new DBConnectionError( $conn, $this->mLastError );
+			}
+		} else {
+			if ( $this->mFailFunction ) {
+				$conn->failFunction( $this->mFailFunction );
+			} else {
+				$conn->failFunction( false );
 			}
-			$reporting = false;
+			$server = $conn->getProperty( 'mServer' );
+			wfLogDBError( "Connection error: {$this->mLastError} ({$server})\n" );
+			$conn->reportConnectionError( "{$this->mLastError} ({$server})" );
 		}
 		wfProfileOut( __METHOD__ );
 	}