From 101c8d24810dd960483b0657ddbfa2c9aef2099f Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 7 Jan 2015 16:06:14 +0000 Subject: [PATCH 1/2] Add zmq_reconnect_ivl options for fedmsg. This should reduce CPU load on some of our machines, like pkgs01. --- roles/fedmsg/base/templates/base.py.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/fedmsg/base/templates/base.py.j2 b/roles/fedmsg/base/templates/base.py.j2 index b658188b19..cec5fe9a01 100644 --- a/roles/fedmsg/base/templates/base.py.j2 +++ b/roles/fedmsg/base/templates/base.py.j2 @@ -63,6 +63,12 @@ config = dict( zmq_tcp_keepalive_cnt=3, zmq_tcp_keepalive_idle=60, zmq_tcp_keepalive_intvl=5, + + # See the following + # - https://github.com/fedora-infra/fedmsg/issues/305 + # - http://api.zeromq.org/3-2:zmq-setsockopt + zmq_reconnect_ivl=100, + zmq_reconnect_ivl_max=1000, ) # This option adds an IPC socket by which we can monitor hub health. From 5fc68e7aaccb24b4099b40f0ea5d1d2e83371cb3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 7 Jan 2015 21:55:43 +0000 Subject: [PATCH 2/2] Add rsyncd to proxy01.stg for log01 to rsync logs. --- playbooks/groups/proxies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 3ef93e8488..fd539bf7ca 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -34,6 +34,7 @@ - fas_client - collectd/base - sudo + - rsyncd tasks: - include: "{{ tasks }}/yumrepos.yml"