Mark Bergsma has submitted this change and it was merged.
Change subject: Split off 503 retry in vcl_error from 5xx retry in vcl_fetch
......................................................................
Split off 503 retry in vcl_error from 5xx retry in vcl_fetch
Change-Id: I5ed02ba3f3185bf37467809de66d926ed794078c
---
M manifests/role/cache.pp
M templates/varnish/wikimedia.vcl.erb
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 2ff4c47..a738c2c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -451,6 +451,7 @@
directors => $varnish_be_directors[$::site],
director_type => "random",
vcl_config => {
+ 'retry503' => 1,
'retry5xx' => 0,
'cache4xx' => "1m",
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
@@ -484,6 +485,7 @@
directors => $varnish_fe_directors[$::site],
director_type => "chash",
vcl_config => {
+ 'retry503' => 1,
'retry5xx' => 0,
'cache4xx' => "1m",
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
@@ -746,6 +748,7 @@
directors => $varnish_directors,
director_type => "random",
vcl_config => {
+ 'retry503' => 1,
'retry5xx' => 1,
'cache4xx' => "1m",
'layer' => 'frontend',
@@ -848,6 +851,7 @@
'retries' => 2,
},
vcl_config => {
+ 'retry503' => 1,
'retry5xx' => 1,
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
'layer' => 'backend',
diff --git a/templates/varnish/wikimedia.vcl.erb
b/templates/varnish/wikimedia.vcl.erb
index 06484f3..a0154e6 100644
--- a/templates/varnish/wikimedia.vcl.erb
+++ b/templates/varnish/wikimedia.vcl.erb
@@ -291,7 +291,7 @@
}
sub vcl_error {
-<% if vcl_config.fetch("retry5xx", "0") == "1" -%>
+<% if vcl_config.fetch("retry503", "0") == "1" -%>
if (obj.status == 503 && req.restarts < 4) {
return(restart);
}
--
To view, visit https://gerrit.wikimedia.org/r/66095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ed02ba3f3185bf37467809de66d926ed794078c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
