Ema has submitted this change and it was merged.
Change subject: varnish: apply nuke_limit and lru_interval bumps to upload only
......................................................................
varnish: apply nuke_limit and lru_interval bumps to upload only
Although increasing nuke_limit and lru_interval seems beneficial when it
comes to T145661, we want to restrict those experiments to cache_upload
backends only.
Bug: T145661
Change-Id: I5fd673e4a003688015d030268950bea0558afb0c
---
M modules/role/manifests/cache/upload.pp
M modules/varnish/templates/initscripts/varnish.systemd.erb
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 2e1ba15..767a87c 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -106,11 +106,14 @@
# default_ttl=7d
$common_runtime_params = ['default_ttl=604800']
+ # Bumping nuke_limit and lru_interval helps with T145661
+ $be_runtime_params = ['nuke_limit=1000','lru_interval=31']
+
role::cache::instances { 'upload':
fe_mem_gb => ceiling(0.4 * $::memorysize_mb / 1024.0),
fe_jemalloc_conf => 'lg_dirty_mult:8,lg_chunk:20',
fe_runtime_params => $common_runtime_params,
- be_runtime_params => $common_runtime_params,
+ be_runtime_params => concat($common_runtime_params,
$be_runtime_params),
app_directors => $app_directors,
fe_vcl_config => $fe_vcl_config,
be_vcl_config => $be_vcl_config,
diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index faf7672..3d2414d 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -38,8 +38,6 @@
<%= @storage -%> \
-p thread_pool_stack=131072 \
-p listen_depth=4096 -p session_max=200000 -p vcc_err_unref=off \
--p nuke_limit=1000 \
--p lru_interval=31 \
-p http_req_size=24576 \
-p gzip_level=8 \
-p gzip_memlevel=9 \
--
To view, visit https://gerrit.wikimedia.org/r/310589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fd673e4a003688015d030268950bea0558afb0c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
