jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363727 )
Change subject: objectcache: Use a separate postgres connection in SqlBagOStuff ...................................................................... objectcache: Use a separate postgres connection in SqlBagOStuff The flags to the driver use new connections for new LBs since fda4d46fc4f810. This makes it consistent with what we do for MySQL already. This should fix warnings about TransactionProfiler in objectcache, as well as warnings about "Pending writes" in WANObjectCache. Bug: T167946 Bug: T154424 Change-Id: I0b0d9a7210b6a3270d32df778fcc4b9918d3dcd1 --- M includes/objectcache/SqlBagOStuff.php 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Aaron Schulz: Looks good to me, but someone else must approve Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php index 6c10301..70795ec 100644 --- a/includes/objectcache/SqlBagOStuff.php +++ b/includes/objectcache/SqlBagOStuff.php @@ -148,7 +148,7 @@ protected function getSeparateMainLB() { global $wgDBtype; - if ( $wgDBtype === 'mysql' && $this->usesMainDB() ) { + if ( $this->usesMainDB() && $wgDBtype !== 'sqlite' ) { if ( !$this->separateMainLB ) { // We must keep a separate connection to MySQL in order to avoid deadlocks $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); @@ -156,8 +156,7 @@ } return $this->separateMainLB; } else { - // However, SQLite has an opposite behavior. And PostgreSQL needs to know - // if we are in transaction or not (@TODO: find some PostgreSQL work-around). + // However, SQLite has an opposite behavior due to DB-level locking return null; } } -- To view, visit https://gerrit.wikimedia.org/r/363727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b0d9a7210b6a3270d32df778fcc4b9918d3dcd1 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Mwjames <jamesin.hongkon...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits