From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 16 Jul 2019 03:47:07 +0000 (-0700)
Subject: filebackend: avoid use of LoadBalancer::newMainLB() in LockManagerGroup
X-Git-Tag: 1.34.0-rc.0~910^2
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=c2d96ef39485ff685fa886bd8a6edefb40355b4c;p=lhc%2Fweb%2Fwiklou.git

filebackend: avoid use of LoadBalancer::newMainLB() in LockManagerGroup

Change-Id: Iffe9f75ddc9cdbea8a4b5e1932dd55ae325f9dbc
---

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' );