From a8f60c1343f660c7e75690e634955ce031893ffd Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Tue, 26 Apr 2016 16:28:38 +1000 Subject: [PATCH] In ParserCache, respect $useOutdated $useOutdated was broken by Ifcc4d2f67f3b77, which forces the cached entry to always have the same revision ID as the latest revision. This probably caused the "pool queue is full" errors reported after Prince's death was announced. Bug: T133659 Change-Id: Ibd111bed203dd72103d772d8dcba4f0d943124fd --- includes/parser/ParserCache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php index 916cfc26a1..8d626db7a5 100644 --- a/includes/parser/ParserCache.php +++ b/includes/parser/ParserCache.php @@ -149,7 +149,7 @@ class ParserCache { wfDebug( "Parser options key expired, touched " . $article->getTouched() . ", epoch $wgCacheEpoch, cached $cacheTime\n" ); return false; - } elseif ( $optionsKey->isDifferentRevision( $article->getLatest() ) ) { + } elseif ( !$useOutdated && $optionsKey->isDifferentRevision( $article->getLatest() ) ) { wfIncrStats( "pcache.miss.revid" ); $revId = $article->getLatest(); $cachedRevId = $optionsKey->getCacheRevisionId(); @@ -225,7 +225,7 @@ class ParserCache { wfDebug( "ParserOutput key expired, touched $touched, " . "epoch $wgCacheEpoch, cached $cacheTime\n" ); $value = false; - } elseif ( $value->isDifferentRevision( $article->getLatest() ) ) { + } elseif ( !$useOutdated && $value->isDifferentRevision( $article->getLatest() ) ) { wfIncrStats( "pcache.miss.revid" ); $revId = $article->getLatest(); $cachedRevId = $value->getCacheRevisionId(); -- 2.20.1