jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341944 )
Change subject: Avoid wfMessage() call in Gadget cache updates
......................................................................
Avoid wfMessage() call in Gadget cache updates
This avoids purge problems due to layered caching. The message cache
is known to take a while to regenerate and uses lockTSE=300.
Bug: T157210
Change-Id: I418e160ddb61c4d3654780f5d2bbb14bc2827e2a
---
M includes/MediaWikiGadgetsDefinitionRepo.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWikiGadgetsDefinitionRepo.php
b/includes/MediaWikiGadgetsDefinitionRepo.php
index f600a7d..06e0760 100644
--- a/includes/MediaWikiGadgetsDefinitionRepo.php
+++ b/includes/MediaWikiGadgetsDefinitionRepo.php
@@ -108,12 +108,14 @@
*/
public function fetchStructuredList( $forceNewText = null ) {
if ( $forceNewText === null ) {
- $g = wfMessage( "gadgets-definition"
)->inContentLanguage();
- if ( !$g->exists() ) {
+ // T157210: avoid using wfMessage() to avoid staleness
due to cache layering
+ $title = Title::makeTitle( NS_MEDIAWIKI,
'Gadgets-definition' );
+ $rev = Revision::newFromTitle( $title );
+ if ( !$rev || !$rev->getContent() ||
$rev->getContent()->isEmpty() ) {
return false; // don't cache
}
- $g = $g->plain();
+ $g = $rev->getContent()->getNativeData();
} else {
$g = $forceNewText;
}
--
To view, visit https://gerrit.wikimedia.org/r/341944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I418e160ddb61c4d3654780f5d2bbb14bc2827e2a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gadgets
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: 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
