Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363727 )
Change subject: [WIP] Use a separate postgres connection in SqlBagOStuff
......................................................................
[WIP] Use a separate postgres connection in SqlBagOStuff
The flags to the driver use new connections for new LBs since
fda4d46fc4f810.
Bug: T167946
Change-Id: I0b0d9a7210b6a3270d32df778fcc4b9918d3dcd1
---
M includes/objectcache/SqlBagOStuff.php
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/27/363727/1
diff --git a/includes/objectcache/SqlBagOStuff.php
b/includes/objectcache/SqlBagOStuff.php
index 6c10301..5951469 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: newchange
Gerrit-Change-Id: I0b0d9a7210b6a3270d32df778fcc4b9918d3dcd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
