jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375088 )
Change subject: Account for DB lag in loadGadgets() caching
......................................................................
Account for DB lag in loadGadgets() caching
Bug: T157210
Change-Id: I86a32407af4d6ebb4fa2e16005c76081a113e8c8
---
M includes/MediaWikiGadgetsDefinitionRepo.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWikiGadgetsDefinitionRepo.php
b/includes/MediaWikiGadgetsDefinitionRepo.php
index c0ae3e0..c0505af 100644
--- a/includes/MediaWikiGadgetsDefinitionRepo.php
+++ b/includes/MediaWikiGadgetsDefinitionRepo.php
@@ -1,5 +1,6 @@
<?php
use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\Database;
/**
* Gadgets repo powered by MediaWiki:Gadgets-definition
@@ -77,7 +78,9 @@
$value = $wanCache->getWithSetCallback(
$key,
Gadget::CACHE_TTL,
- function ( $old, &$ttl ) use ( $us ) {
+ function ( $old, &$ttl, &$setOpts ) use ( $us ) {
+ $setOpts += Database::getCacheSetOptions(
wfGetDB( DB_REPLICA ) );
+
$now = microtime( true );
$gadgets = $us->fetchStructuredList();
if ( $gadgets === false ) {
--
To view, visit https://gerrit.wikimedia.org/r/375088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86a32407af4d6ebb4fa2e16005c76081a113e8c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
