BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276740
Change subject: VCL: remove vcl_config.do_gzip conditional
......................................................................
VCL: remove vcl_config.do_gzip conditional
This is now on for all clusters and has been for some time. It's
been toggled off for 1x cluster a couple of times in the recent
past for bug suspicion, but the problem always ended up lying
elsewhere, so may as well kill some complexity. We can always
conditional-hack it if we need to for actual experimentation.
Change-Id: I84c7e3caa31ceaa328959b1ca6351731f50ba35e
---
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
5 files changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/276740/1
diff --git a/modules/role/manifests/cache/maps.pp
b/modules/role/manifests/cache/maps.pp
index 81f2752..f3f7e64 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -54,7 +54,6 @@
$common_vcl_config = {
'cache4xx' => '1m',
'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
- 'do_gzip' => true,
'ttl_cap' => '1d',
'pass_random' => true,
}
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 009e805..f17dc2b 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -207,7 +207,6 @@
$common_vcl_config = {
'cache4xx' => '1m',
- 'do_gzip' => true,
'allowed_methods' => '^(GET|DELETE|HEAD|POST|PURGE|PUT|OPTIONS)$',
'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
'pass_random' => true,
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 46f4e45..d2e1cec 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -103,7 +103,6 @@
'static_host' => $::role::cache::base::static_host,
'bits_domain' => $::role::cache::base::bits_domain,
'top_domain' => $::role::cache::base::top_domain,
- 'do_gzip' => true,
'pass_random' => true,
}
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 4457a8c..a2a9ce1 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -68,7 +68,6 @@
'purge_host_regex' => $::role::cache::base::purge_host_only_upload_re,
'upload_domain' => $::role::cache::base::upload_domain,
'allowed_methods' => '^(GET|HEAD|OPTIONS|PURGE)$',
- 'do_gzip' => true,
}
# Note pass_random true in BE, false in FE below.
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index f01b6d5..e6d4913 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -262,12 +262,10 @@
set beresp.grace = 60m;
-<% if @vcl_config.fetch("do_gzip", false) -%>
// Compress compressible things if the backend didn't already
if (beresp.http.content-type ~
"json|text|html|script|xml|icon|ms-fontobject|ms-opentype|x-font") {
set beresp.do_gzip = true;
}
-<% end -%>
}
sub wm_common_deliver {
--
To view, visit https://gerrit.wikimedia.org/r/276740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84c7e3caa31ceaa328959b1ca6351731f50ba35e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
