From 6898d06f8fec29a6b1f0a5957d860c0675c57985 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 24 Aug 2017 15:10:19 -0700 Subject: [PATCH] Disable rebound CDN purges for backlinks in HTMLCacheUpdateJob These are there to handle regeneration race conditions due to replication lag. If there happens to already be a huge amount of purges, the cost of this can be too high. Also, if the queue is backlogged, then it is already delayed, so extra delayed jobs do not help and just add to the backlog in that scenario. Bug: T173710 Change-Id: Ida0bf44233072e1356a9fe63866d522e4bb2d0ca --- includes/jobqueue/jobs/HTMLCacheUpdateJob.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php index 07d68e76f5..9d0f87cc11 100644 --- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php +++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php @@ -139,9 +139,13 @@ class HTMLCacheUpdateJob extends Job { __METHOD__ ) ); - // Update CDN - $u = CdnCacheUpdate::newFromTitles( $titleArray ); - $u->doUpdate(); + // Update CDN; call purge() directly so as to not bother with secondary purges + $urls = []; + foreach ( $titleArray as $title ) { + /** @var Title $title */ + $urls = array_merge( $urls, $title->getCdnUrls() ); + } + CdnCacheUpdate::purge( $urls ); // Update file cache if ( $wgUseFileCache ) { -- 2.20.1