BBlack has submitted this change and it was merged.
Change subject: Revert "VCL: grace-mode only in frontend caches"
......................................................................
Revert "VCL: grace-mode only in frontend caches"
This reverts commit 0f4de6da8c85a056007b54eae4082d9bd3d71848.
Change-Id: Ie4110a7354c299161acf55ab09fb5ca8f08a8de5
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 3 insertions(+), 20 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 550641d..1855293 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -554,15 +554,6 @@
error 403 "HTTP method not allowed.";
}
-<% if @vcl_config.fetch("layer", "") == "frontend" -%>
- set req.grace = 5m;
-<% else -%>
- // disable grace in backends, so we do not serve stale content to
- // frontends, which would trigger hit-for-pass there (a value of zero
- // is buggy in varnish 3.x and uses the default 10s value)
- set req.grace = 0.000001s
-<% end -%>
-
<% if @vcl_config.fetch("has_def_backend", "yes") == "yes" -%>
/* Select the default backend/director, which is always the one named
'backend'.
* If an instance has no default 'backend', it must declare
has_def_backend==no,
@@ -570,11 +561,11 @@
*/
set req.backend = backend;
-<% if @vcl_config.fetch("layer", "") == "frontend" -%>
- if (!req.backend.healthy) {
+ if (req.backend.healthy) {
+ set req.grace = 5m;
+ } else {
set req.grace = 60m;
}
-<% end -%>
<% end -%>
<% if @vcl_config.fetch("layer", "") == "frontend" -%>
@@ -634,15 +625,7 @@
}
}
<% end -%>
-
-<% if @vcl_config.fetch("layer", "") == "frontend" -%>
set beresp.grace = 60m;
-<% else -%>
- // disable grace in backends, so we do not serve stale content to
- // frontends, which would trigger hit-for-pass there (a value of zero
- // is buggy in varnish 3.x and uses the default 10s value)
- set beresp.grace = 0.000001s
-<% end -%>
<% if @vcl_config.fetch("do_gzip", false) -%>
// Compress compressible things if the backend didn't already
--
To view, visit https://gerrit.wikimedia.org/r/259776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4110a7354c299161acf55ab09fb5ca8f08a8de5
Gerrit-PatchSet: 1
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
