BBlack has submitted this change and it was merged. Change subject: cache_text: switch to file storage backend on Varnish 4 ......................................................................
cache_text: switch to file storage backend on Varnish 4 On Varnish 4, the persistent storage backend is buggy (T142810) and deprecated. Switch cache_text backends to -sfile on Varnish 4. See T142848 for the full reasoning behind the choice of dropping persistent storage. Bug: T142810 Bug: T131503 Ref: https://www.varnish-cache.org/docs/trunk/phk/persistent.html Change-Id: I3e2b0616d325d6cef4e7259d6aee2a6914f7f3dc --- M modules/role/manifests/cache/text.pp 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/manifests/cache/text.pp b/modules/role/manifests/cache/text.pp index 86380ae..c124385 100644 --- a/modules/role/manifests/cache/text.pp +++ b/modules/role/manifests/cache/text.pp @@ -113,6 +113,13 @@ $common_runtime_params = ['default_ttl=2592000'] + if ($::role::cache::base::varnish_version4) { + $text_storage_args = $::role::cache::base::file_storage_args + } + else { + $text_storage_args = $::role::cache::base::persistent_storage_args + } + role::cache::instances { 'text': fe_mem_gb => ceiling(0.4 * $::memorysize_mb / 1024.0), fe_jemalloc_conf => 'lg_dirty_mult:8,lg_chunk:16', @@ -123,7 +130,7 @@ be_vcl_config => $be_vcl_config, fe_extra_vcl => ['text-common', 'zero', 'normalize_path', 'geoip'], be_extra_vcl => ['text-common', 'normalize_path'], - be_storage => $::role::cache::base::persistent_storage_args, + be_storage => $text_storage_args, fe_cache_be_opts => $fe_cache_be_opts, be_cache_be_opts => $be_cache_be_opts, cluster_nodes => hiera('cache::text::nodes'), -- To view, visit https://gerrit.wikimedia.org/r/319609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e2b0616d325d6cef4e7259d6aee2a6914f7f3dc Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
