diff options
| author | Aaron Schulz <aschulz@wikimedia.org> | 2019-07-15 20:47:07 -0700 |
|---|---|---|
| committer | Aaron Schulz <aschulz@wikimedia.org> | 2019-07-16 06:31:15 +0000 |
| commit | c2d96ef39485ff685fa886bd8a6edefb40355b4c (patch) | |
| tree | 33b50903f1a87021541edf0a8dbbbb6cbf78fe09 /includes/filebackend/lockmanager | |
| parent | f6e07993406f4ec3b6aaa3b147e30d3da3cc04a8 (diff) | |
| download | mediawikicore-c2d96ef39485ff685fa886bd8a6edefb40355b4c.tar.gz mediawikicore-c2d96ef39485ff685fa886bd8a6edefb40355b4c.zip | |
filebackend: avoid use of LoadBalancer::newMainLB() in LockManagerGroup
Change-Id: Iffe9f75ddc9cdbea8a4b5e1932dd55ae325f9dbc
Diffstat (limited to 'includes/filebackend/lockmanager')
| -rw-r--r-- | includes/filebackend/lockmanager/LockManagerGroup.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/includes/filebackend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php index 43f6010d3c2f..957af3e4ae5d 100644 --- a/includes/filebackend/lockmanager/LockManagerGroup.php +++ b/includes/filebackend/lockmanager/LockManagerGroup.php @@ -121,10 +121,13 @@ class LockManagerGroup { $config = $this->managers[$name]['config']; if ( $class === DBLockManager::class ) { $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); - $lb = $lbFactory->newMainLB( $config['domain'] ); - $dbw = $lb->getLazyConnectionRef( DB_MASTER, [], $config['domain'] ); - - $config['dbServers']['localDBMaster'] = $dbw; + $lb = $lbFactory->getMainLB( $config['domain'] ); + $config['dbServers']['localDBMaster'] = $lb->getLazyConnectionRef( + DB_MASTER, + [], + $config['domain'], + $lb::CONN_TRX_AUTOCOMMIT + ); $config['srvCache'] = ObjectCache::getLocalServerInstance( 'hash' ); } $config['logger'] = LoggerFactory::getInstance( 'LockManager' ); |