Merge "rdbms: make safeWaitForMasterPos() respect "waitTimeout""

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index ce31078,0af0e6e..04b3ea3
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -49,7 -49,7 +49,7 @@@ class LoadBalancer implements ILoadBala
        /** @var bool Whether to disregard replica DB lag as a factor in replica DB selection */
        private $mAllowLagged;
        /** @var int Seconds to spend waiting on replica DB lag to resolve */
-       private $mWaitTimeout;
+       private $waitTimeout;
        /** @var array The LoadMonitor configuration */
        private $loadMonitorConfig;
        /** @var array[] $aliases Map of (table => (dbname, schema, prefix) map) */
@@@ -153,7 -153,7 +153,7 @@@
                        : DatabaseDomain::newUnspecified();
                $this->setLocalDomain( $localDomain );
  
-               $this->mWaitTimeout = isset( $params['waitTimeout'] )
+               $this->waitTimeout = isset( $params['waitTimeout'] )
                        ? $params['waitTimeout']
                        : self::MAX_WAIT_DEFAULT;
  
@@@ -515,7 -515,7 +515,7 @@@
        }
  
        public function waitForAll( $pos, $timeout = null ) {
-               $timeout = $timeout ?: $this->mWaitTimeout;
+               $timeout = $timeout ?: $this->waitTimeout;
  
                $oldPos = $this->mWaitForPos;
                try {
@@@ -575,11 -575,11 +575,11 @@@
         * Wait for a given replica DB to catch up to the master pos stored in $this
         * @param int $index Server index
         * @param bool $open Check the server even if a new connection has to be made
-        * @param int $timeout Max seconds to wait; default is mWaitTimeout
+        * @param int $timeout Max seconds to wait; default is "waitTimeout" given to __construct()
         * @return bool
         */
        protected function doWait( $index, $open = false, $timeout = null ) {
-               $timeout = max( 1, $timeout ?: $this->mWaitTimeout );
+               $timeout = max( 1, $timeout ?: $this->waitTimeout );
  
                // Check if we already know that the DB has reached this point
                $server = $this->getServerName( $index );
@@@ -1006,17 -1006,7 +1006,17 @@@
                        throw new DBAccessError();
                }
  
 -              if ( $domainOverride->getDatabase() !== null ) {
 +              // Handle $domainOverride being a specified or an unspecified domain
 +              if ( $domainOverride->getDatabase() === null ) {
 +                      // Normally, an RDBMS requires a DB name specified on connection and the $server
 +                      // configuration array is assumed to already specify an appropriate DB name.
 +                      if ( $server['type'] === 'mysql' ) {
 +                              // For MySQL, DATABASE and SCHEMA are synonyms, connections need not specify a DB,
 +                              // and the DB name in $server might not exist due to legacy reasons (the default
 +                              // domain used to ignore the local LB domain, even when mismatched).
 +                              $server['dbname'] = null;
 +                      }
 +              } else {
                        $server['dbname'] = $domainOverride->getDatabase();
                        $server['schema'] = $domainOverride->getSchema();
                }
@@@ -1372,7 -1362,7 +1372,7 @@@
                $this->trxRoundId = false;
                $this->forEachOpenMasterConnection(
                        function ( IDatabase $conn ) use ( $fname, $restore ) {
 -                              if ( $conn->writesOrCallbacksPending() ) {
 +                              if ( $conn->writesOrCallbacksPending() || $conn->explicitTrxActive() ) {
                                        $conn->rollback( $fname, $conn::FLUSHING_ALL_PEERS );
                                }
                                if ( $restore ) {
@@@ -1448,7 -1438,7 +1448,7 @@@
        }
  
        public function hasOrMadeRecentMasterChanges( $age = null ) {
-               $age = ( $age === null ) ? $this->mWaitTimeout : $age;
+               $age = ( $age === null ) ? $this->waitTimeout : $age;
  
                return ( $this->hasMasterChanges()
                        || $this->lastMasterChangeTimestamp() > microtime( true ) - $age );
@@@ -1658,10 -1648,12 +1658,12 @@@
        /**
         * @param IDatabase $conn
         * @param DBMasterPos|bool $pos
-        * @param int $timeout
+        * @param int|null $timeout
         * @return bool
         */
-       public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = 10 ) {
+       public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = null ) {
+               $timeout = max( 1, $timeout ?: $this->waitTimeout );
+ 
                if ( $this->getServerCount() <= 1 || !$conn->getLBInfo( 'replica' ) ) {
                        return true; // server is not a replica DB
                }