Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

objectcache: rename "slaveOnly" parameter to "replicaOnly" in SQLBagOStuff

Browse source 
Also removed redundant check

Change-Id: I9f454eb15f223f5a9816dca4510c1a9add540b49
This commit is contained in:
Aaron Schulz 2019-07-09 23:51:43 -07:00
parent 0540442ecb
commit 65b4b61284
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/DefaultSettings.php
View file

@ -2416,11 +2416,11 @@ $wgObjectCaches = [
'class' => ReplicatedBagOStuff::class,
'readFactory' => [
'class' => SqlBagOStuff::class,
'args' => [ [ 'slaveOnly' => true ] ]
'args' => [ [ 'replicaOnly' => true ] ]
],
'writeFactory' => [
'class' => SqlBagOStuff::class,
'args' => [ [ 'slaveOnly' => false ] ]
'args' => [ [ 'replicaOnly' => false ] ]
],
'loggroup' => 'SQLBagOStuff',
'reportDupes' => false

7
includes/objectcache/SqlBagOStuff.php
View file

@ -110,7 +110,7 @@ class SqlBagOStuff extends BagOStuff {
* MySQL bugs 61735 <https://bugs.mysql.com/bug.php?id=61735>
* and 61736 <https://bugs.mysql.com/bug.php?id=61736>.
*
* - slaveOnly: Whether to only use replica DBs and avoid triggering
* - replicaOnly: Whether to only use replica DBs and avoid triggering
* garbage collection logic of expired items. This only
* makes sense if the primary DB is used and only if get()
* calls will be used. This is used by ReplicatedBagOStuff.
@ -162,7 +162,8 @@ class SqlBagOStuff extends BagOStuff {
if ( isset( $params['syncTimeout'] ) ) {
$this->syncTimeout = $params['syncTimeout'];
}
$this->replicaOnly = !empty( $params['slaveOnly'] );
// Backwards-compatibility for < 1.34
$this->replicaOnly = $params['replicaOnly'] ?? ( $params['slaveOnly'] ?? false );
}
/**
@ -609,8 +610,6 @@ class SqlBagOStuff extends BagOStuff {
if (
// Random purging is enabled
$this->purgePeriod &&
// This is not using a replica DB
!$this->replicaOnly &&
// Only purge on one in every $this->purgePeriod writes
mt_rand( 0, $this->purgePeriod - 1 ) == 0 &&
// Avoid repeating the delete within a few seconds