Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343844 )
Change subject: varnish: swap around backend ttl cap and keep values [1/2]
......................................................................
varnish: swap around backend ttl cap and keep values [1/2]
As a first step towards swapping backend ttl cap and keep values, reduce
ttl_cap from 7d to 3d and increase keep from 1d to 3d.
Change-Id: I9a7224aba9a826c1e18814a8873a2a66b28f58a4
---
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index 648f1d6..a4c6463 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -283,9 +283,9 @@
// cases later.
unset beresp.http.X-CDIS;
- // Hard TTL cap on all fetched objects (default 7d)
- if (beresp.ttl > <%= @vcl_config.fetch("ttl_cap", "7d") %>) {
- set beresp.ttl = <%= @vcl_config.fetch("ttl_cap", "7d") %>;
+ // Hard TTL cap on all fetched objects (default 3d)
+ if (beresp.ttl > <%= @vcl_config.fetch("ttl_cap", "3d") %>) {
+ set beresp.ttl = <%= @vcl_config.fetch("ttl_cap", "3d") %>;
}
/* Don't cache private, no-cache, no-store objects */
@@ -300,10 +300,10 @@
set beresp.grace = <%= @vcl_config.fetch("grace_sick", "60m") %>;
- if (beresp.ttl < <%= @vcl_config.fetch("keep", "1d") %>) {
+ if (beresp.ttl < <%= @vcl_config.fetch("keep", "3d") %>) {
set beresp.keep = beresp.ttl;
} else {
- set beresp.keep = <%= @vcl_config.fetch("keep", "1d") %>;
+ set beresp.keep = <%= @vcl_config.fetch("keep", "3d") %>;
}
// Compress compressible things if the backend didn't already
--
To view, visit https://gerrit.wikimedia.org/r/343844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a7224aba9a826c1e18814a8873a2a66b28f58a4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
