Mark Bergsma has submitted this change and it was merged.
Change subject: Revert "Switch tier 2 (esams) upload backends to use chash when
talking upstream"
......................................................................
Revert "Switch tier 2 (esams) upload backends to use chash when talking
upstream"
This reverts commit 9cff5bf7639f231ed382e3490194b492ae4b32f6
Change-Id: Iead88fb207df39f3a0dabd40fe4757b6be81e91a
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ab33e52..b3a5fbf 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -616,10 +616,7 @@
default => "-s
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s
main-sdb3=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G -s
bigobj-sda3=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s
bigobj-sdb3=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
},
directors => $varnish_be_directors[$::site],
- director_type => $cluster_tier ? {
- 1 => 'random',
- default => 'chash',
- },
+ director_type => "random",
vcl_config => {
'retry5xx' => 0,
'cache4xx' => "1m",
--
To view, visit https://gerrit.wikimedia.org/r/66126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iead88fb207df39f3a0dabd40fe4757b6be81e91a
Gerrit-PatchSet: 2
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
