Mark Bergsma has submitted this change and it was merged.
Change subject: Set esams backend director to chash
......................................................................
Set esams backend director to chash
Change-Id: I45557fbf6e5b9f6f38f58210242f5e24eef947b4
---
M manifests/role/cache.pp
1 file changed, 13 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 704b0c0..a91f842 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -664,6 +664,12 @@
$storage_size_main = 250
}
+ if $cluster_tier == 1 {
+ $director_retries = 2
+ } else {
+ $director_retries = $backend_weight * 4
+ }
+
include standard,
nrpe
@@ -698,7 +704,13 @@
default => "-s
main1=persistent,/srv/sda3/varnish.main1,${storage_size_main}G -s
main2=persistent,/srv/sdb3/varnish.main2,${storage_size_main}G -s
bigobj1=file,/srv/sda3/varnish.bigobj1,${storage_size_bigobj}G -s
bigobj2=file,/srv/sdb3/varnish.bigobj2,${storage_size_bigobj}G",
},
directors => $varnish_be_directors[$cluster_tier],
- director_type => "random", # FIXME: set to chash
on new servers
+ director_type => $cluster_tier ? {
+ 1 => 'random',
+ default => 'chash',
+ },
+ director_options => {
+ 'retries' => $director_retries,
+ },
vcl_config => {
'default_backend' => $default_backend,
'retry5xx' => 0,
--
To view, visit https://gerrit.wikimedia.org/r/71335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45557fbf6e5b9f6f38f58210242f5e24eef947b4
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
