jenkins-bot has submitted this change and it was merged.
Change subject: Don't retry invalid thumbnail requests due to impossible width
......................................................................
Don't retry invalid thumbnail requests due to impossible width
At the moment this isn't going to work in production, because varnish
turns 400s into 500s. But I'll try to fix that separately.
Bug: T106740
Change-Id: Id156ee4ac986ad2a6d7e49dfe8aa7577764eca11
---
M includes/jobqueue/jobs/ThumbnailRenderJob.php
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/jobs/ThumbnailRenderJob.php
b/includes/jobqueue/jobs/ThumbnailRenderJob.php
index d1d9999..f558c48 100644
--- a/includes/jobqueue/jobs/ThumbnailRenderJob.php
+++ b/includes/jobqueue/jobs/ThumbnailRenderJob.php
@@ -55,11 +55,10 @@
wfDebug( __METHOD__ . ": received status
{$status}\n" );
- if ( $status === 200 || $status === 301 ||
$status === 302 ) {
+ // 400 happens when requesting a size greater
or equal than the original
+ if ( $status === 200 || $status === 301 ||
$status === 302 || $status === 400 ) {
return true;
} elseif ( $status ) {
- // Note that this currently happens
(500) when requesting sizes larger then or
- // equal to the original, which is
harmless.
$this->setLastError( __METHOD__ . ':
incorrect HTTP status ' . $status . ' when hitting ' . $thumbUrl );
return false;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/227456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id156ee4ac986ad2a6d7e49dfe8aa7577764eca11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
