Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/211733
Change subject: Limit udp2log rsync daemon's bandwidth usage
......................................................................
Limit udp2log rsync daemon's bandwidth usage
Change-Id: I38a7e35252bdb094a6cc8f7d9e956280a8e3998e
---
M manifests/misc/udp2log.pp
M modules/rsync/manifests/server.pp
M modules/rsync/templates/rsync.default.erb
3 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/211733/1
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index faf4395..5d5c8c0 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -73,7 +73,14 @@
$path = '/var/log/udp2log/archive',
$hosts_allow = ['stat1002.eqiad.wmnet']
) {
- include rsync::server
+
+
+ class { 'rsync::server':
+ # We don't want rsyncs to saturate udp2log host NICs.
+ # Limit to 500M / sec.
+ rsync_opts => ['--bwlimit 512000'],
+ }
+
rsync::server::module { 'udp2log':
comment => 'udp2log log files',
path => $path,
diff --git a/modules/rsync/manifests/server.pp
b/modules/rsync/manifests/server.pp
index 75aea85..4ba72d1 100644
--- a/modules/rsync/manifests/server.pp
+++ b/modules/rsync/manifests/server.pp
@@ -14,8 +14,9 @@
$use_xinetd = false, # this parameter should not be used. xinetd is not
available.
$address = '0.0.0.0',
$motd_file = 'UNSET',
- $log_file = 'UNSET',
- $use_chroot = 'yes'
+ $log_file = 'UNSET',
+ $use_chroot = 'yes',
+ $rsync_opts = [],
) inherits rsync {
$rsync_fragments = '/etc/rsync.d'
diff --git a/modules/rsync/templates/rsync.default.erb
b/modules/rsync/templates/rsync.default.erb
index e120f48..7a5ad7c 100644
--- a/modules/rsync/templates/rsync.default.erb
+++ b/modules/rsync/templates/rsync.default.erb
@@ -25,7 +25,7 @@
# Possibilities are:
# --address=123.45.67.89 (bind to a specific IP address)
# --port=8730 (bind to specified port;
default 873)
-RSYNC_OPTS=''
+RSYNC_OPTS='<%= @rsync_opts.sort.join(' ') %>'
# run rsyncd at a nice level?
# the rsync daemon can impact performance due to much I/O and CPU usage,
--
To view, visit https://gerrit.wikimedia.org/r/211733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38a7e35252bdb094a6cc8f7d9e956280a8e3998e
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
