* Close the master connection in safeWaitForMasterPos() if created.
* Remove unnecessary reuseConnection() calls.
* Add DOMAIN_ANY constant for readability.
Change-Id: I9e64a7405e0eedc50e7b93d05d65cf00d5544a77
/** @var integer Request a master DB connection */
const DB_MASTER = -2;
/** @var integer Request a master DB connection */
const DB_MASTER = -2;
+ /** @var string Domain specifier when no specific database needs to be selected */
+ const DOMAIN_ANY = '';
+
/**
* Construct a manager of IDatabase connection objects
*
/**
* Construct a manager of IDatabase connection objects
*
/** @var integer Warn when this many connection are held */
const CONN_HELD_WARN_THRESHOLD = 10;
/** @var integer Warn when this many connection are held */
const CONN_HELD_WARN_THRESHOLD = 10;
/** @var integer Default 'max lag' when unspecified */
const MAX_LAG_DEFAULT = 10;
/** @var integer Default 'max lag' when unspecified */
const MAX_LAG_DEFAULT = 10;
- /** @var integer Max time to wait for a replica DB to catch up (e.g. ChronologyProtector) */
- const POS_WAIT_TIMEOUT = 10;
/** @var integer Seconds to cache master server read-only status */
const TTL_CACHE_READONLY = 5;
/** @var integer Seconds to cache master server read-only status */
const TTL_CACHE_READONLY = 5;
$this->localDomainIdAlias = $this->localDomain->getDatabase();
}
$this->localDomainIdAlias = $this->localDomain->getDatabase();
}
- $this->mWaitTimeout = isset( $params['waitTimeout'] )
- ? $params['waitTimeout']
- : self::POS_WAIT_TIMEOUT;
+ $this->mWaitTimeout = isset( $params['waitTimeout'] ) ? $params['waitTimeout'] : 10;
$this->mReadIndex = -1;
$this->mConns = [
$this->mReadIndex = -1;
$this->mConns = [
- $conn = $this->openConnection( $index, '' );
+ $conn = $this->openConnection( $index, self::DOMAIN_ANY );
if ( !$conn ) {
$this->replLogger->warning( __METHOD__ . ": failed to connect to $server" );
if ( !$conn ) {
$this->replLogger->warning( __METHOD__ . ": failed to connect to $server" );
- // Get the current master position
- $dbw = $this->getConnection( self::DB_MASTER );
- $pos = $dbw->getMasterPos();
- $this->reuseConnection( $dbw );
+ // Get the current master position, opening a connection if needed
+ $masterConn = $this->getAnyOpenConnection( $this->getWriterIndex() );
+ if ( $masterConn ) {
+ $pos = $masterConn->getMasterPos();
+ } else {
+ $masterConn = $this->openConnection( $this->getWriterIndex(), self::DOMAIN_ANY );
+ $pos = $masterConn->getMasterPos();
+ $this->closeConnection( $masterConn );
+ }
}
if ( $pos instanceof DBMasterPos ) {
}
if ( $pos instanceof DBMasterPos ) {
$this->sites->setSite( $site );
}
}
$this->sites->setSite( $site );
}
}
-
- $this->dbLoadBalancer->reuseConnection( $dbr );
$dbw->endAtomic( __METHOD__ );
$dbw->endAtomic( __METHOD__ );
- $this->dbLoadBalancer->reuseConnection( $dbw );
-
$this->reset();
return $success;
$this->reset();
return $success;
$ok = $dbw->delete( 'site_identifiers', '*', __METHOD__ ) && $ok;
$dbw->endAtomic( __METHOD__ );
$ok = $dbw->delete( 'site_identifiers', '*', __METHOD__ ) && $ok;
$dbw->endAtomic( __METHOD__ );
- $this->dbLoadBalancer->reuseConnection( $dbw );
-
$this->reset();
return $ok;
$this->reset();
return $ok;