Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111523
Change subject: [DO NOT MERGE] Setting batch_num_messages to 6000
......................................................................
[DO NOT MERGE] Setting batch_num_messages to 6000
Don't merge this yet. Magnus and are are trying to catch cp3019
misbehaving again, and we think that this setting might fix it.
Change-Id: I2243fc06f410a5bdf8a8ce489e3a3b1fe16ecb2c
---
M manifests/role/cache.pp
M modules/varnishkafka
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/111523/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index aed7e3c..af24a20 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -429,6 +429,10 @@
format =>
"%{fake_tag0@hostname?${::fqdn}}x %{@sequence!num?0}n %{%FT%T@dt}t
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q
%{Content-Type@content_type}o %{Referer@referer}i
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o",
message_send_max_retries => 3,
queue_buffering_max_messages => 2000000,
+ # bits varnishes do about 6000 reqs / sec each.
+ # We want to buffer for about max 1 second.
+ batch_num_messages => 6000,
+
# large timeout to account for potential cross DC latencies
topic_request_timeout_ms => 30000, # request ack timeout
# Write out stats to varnishkafka.stats.json
diff --git a/modules/varnishkafka b/modules/varnishkafka
index bab034a..04ece4f 160000
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
-Subproject commit bab034a007f665303bc3c3fad48e34eccbb3648c
+Subproject commit 04ece4fb9de20929eaaad0c7a26100d424db22e4
--
To view, visit https://gerrit.wikimedia.org/r/111523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2243fc06f410a5bdf8a8ce489e3a3b1fe16ecb2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
