BBlack has submitted this change and it was merged.
Change subject: Revert "ttl_fixed: limit to tier-1 backends"
......................................................................
Revert "ttl_fixed: limit to tier-1 backends"
Due to potential fallout noted in T124954#2032419 - should understand what's
going on better and possible come up with a better long-term solution before
messing with this...
This reverts commit f5259ceb74a526d633c43abe6d16addaa5a509e7.
Change-Id: Ie219aaf24a9e5c94c86db65e13376d5af54a90f0
---
M modules/role/manifests/cache/upload.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
2 files changed, 3 insertions(+), 7 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 7e0a9bd..226ff24 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -83,7 +83,7 @@
$be_vcl_config = merge($common_vcl_config, {
'layer' => 'backend',
- 'ttl_fixed_1be' => '30d',
+ 'ttl_fixed' => '30d',
'ttl_cap' => '30d',
})
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 65e4fa9..62e4e51 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -474,16 +474,12 @@
}
sub vcl_fetch {
-<% if @site_tier == "one" && @vcl_config.fetch("layer", "") == "backend" -%>
-<% if @vcl_config.fetch("ttl_fixed_1be", false) -%>
+<% if @vcl_config.fetch("ttl_fixed", false) -%>
// Fixed TTL (rare/questionable, only used on upload backend right now)
- // Only valid in tier-1 backend; it would be incorrect to re-raise the
- // TTL on cache->cache fetches...
// Note the ttl_cap comes after this and takes precedence!
if (beresp.status <= 400) {
- set beresp.ttl = <%= @vcl_config.fetch("ttl_fixed_1be",
"invalid") %>;
+ set beresp.ttl = <%= @vcl_config.fetch("ttl_fixed", "invalid")
%>;
}
-<% end -%>
<% end -%>
// Hard TTL cap on all fetched objects (default 21d)
--
To view, visit https://gerrit.wikimedia.org/r/271024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie219aaf24a9e5c94c86db65e13376d5af54a90f0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
