Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299526
Change subject: Revert "cache_misc: puppetize switch to file storage"
......................................................................
Revert "cache_misc: puppetize switch to file storage"
We've tried testing file vs persistent as a factor in some varnish4 bugs
such as T134989 and T135038. The bugs were not storage-backend related.
This reverts commit f39048ac3aaf1f2d04a686b590cb0c3dd3e552b8.
Change-Id: I620c274491531a3d9ab084a73b67bb74b4697e21
---
M modules/role/manifests/cache/misc.pp
1 file changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/299526/1
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index bbbec02..8f20a0d 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -265,14 +265,6 @@
'ttl_cap' => '1d',
})
- # We're testing file vs persistent as a factor in some varnish4 bugs
observed...
- $storage_parts = $::role::cache::2layer::storage_parts
- $storage_size = $::role::cache::2layer::storage_size
- $misc_storage_args = join([
- "-s
main1=file,/srv/${storage_parts[0]}/varnish.main1,${storage_size}G",
- "-s
main2=file,/srv/${storage_parts[1]}/varnish.main2,${storage_size}G",
- ], ' ')
-
role::cache::instances { 'misc':
fe_mem_gb => ceiling(0.5 * $::memorysize_mb / 1024.0),
fe_jemalloc_conf => 'lg_dirty_mult:8,lg_chunk_size:17',
@@ -282,7 +274,7 @@
be_vcl_config => $be_vcl_config,
fe_extra_vcl => ['misc-common'],
be_extra_vcl => ['misc-common'],
- be_storage => $misc_storage_args,
+ be_storage => $::role::cache::2layer::persistent_storage_args,
fe_cache_be_opts => $fe_cache_be_opts,
be_cache_be_opts => $be_cache_be_opts,
cluster_nodes => hiera('cache::misc::nodes'),
--
To view, visit https://gerrit.wikimedia.org/r/299526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I620c274491531a3d9ab084a73b67bb74b4697e21
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
