Mark Bergsma has submitted this change and it was merged.
Change subject: The retry503 parameter now specifies the number of restarts
......................................................................
The retry503 parameter now specifies the number of restarts
Change-Id: I95f77980c4f508db439508e9d882ef9784f96831
---
M manifests/role/cache.pp
M templates/varnish/wikimedia.vcl.erb
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index d2f74f9..9c741d6 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -751,7 +751,7 @@
directors => $varnish_directors,
director_type => "random",
vcl_config => {
- 'retry503' => 1,
+ 'retry503' => 4,
'retry5xx' => 1,
'cache4xx' => "1m",
'layer' => 'frontend',
@@ -854,7 +854,7 @@
'retries' => 2,
},
vcl_config => {
- 'retry503' => 1,
+ 'retry503' => 4,
'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 a0154e6..b2dfb7d 100644
--- a/templates/varnish/wikimedia.vcl.erb
+++ b/templates/varnish/wikimedia.vcl.erb
@@ -291,8 +291,8 @@
}
sub vcl_error {
-<% if vcl_config.fetch("retry503", "0") == "1" -%>
- if (obj.status == 503 && req.restarts < 4) {
+<% if vcl_config.fetch("retry503", "0") != "0" -%>
+ if (obj.status == 503 && req.restarts < <%= vcl_config["retry503"].to_i
%>) {
return(restart);
}
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/66099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95f77980c4f508db439508e9d882ef9784f96831
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
