Faidon Liambotis has submitted this change and it was merged.
Change subject: varnish: quick fix for mobile redirect outage
......................................................................
varnish: quick fix for mobile redirect outage
Commit 4eb918924cbadb98d0e0e144e97d35376abfbbb8 added geoiplookup to all
clusters, via wikimedia.vcl. It did that by the usual vcl_error hackery,
and by using error code 666.
Unfortunately, this is the same error code we use for the mobile
redirect, which means that now instead of a mobile redirect we are
emitting geoiplookups(!). This was noticed by users who were puzzled at
the geoiplookup JSON.
Switch to 668 (which seems unused from a git grep) as a quick hack until
we can think of a better, proper fix that avoids these sort of
collisions.
Bug: T98309
Change-Id: I366b7e86102a0dbac416b127cbb3fff23e4ad923
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index da555eb..fa3780a 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -308,7 +308,7 @@
<% if @cluster_options.fetch("enable_geoiplookup", false) -%>
if (req.url == "/geoiplookup" || req.http.host ==
"geoiplookup.wikimedia.org") {
- error 666 "geoiplookup";
+ error 668 "geoiplookup";
}
<% end -%>
@@ -408,7 +408,7 @@
<% if @cluster_options.fetch("enable_geoiplookup", false) -%>
// Support geoiplookup
- if (obj.status == 666) {
+ if (obj.status == 668) {
call geoip_lookup;
set obj.status = 200;
set obj.http.Connection = "keep-alive";
--
To view, visit https://gerrit.wikimedia.org/r/209206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I366b7e86102a0dbac416b127cbb3fff23e4ad923
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
