From c2d96ef39485ff685fa886bd8a6edefb40355b4c Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 15 Jul 2019 20:47:07 -0700 Subject: [PATCH] filebackend: avoid use of LoadBalancer::newMainLB() in LockManagerGroup Change-Id: Iffe9f75ddc9cdbea8a4b5e1932dd55ae325f9dbc --- includes/filebackend/lockmanager/LockManagerGroup.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/includes/filebackend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php index 43f6010d3c..957af3e4ae 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' ); -- 2.20.1