From 852e41768c9566ae19ca8816f7630023774682bb Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 2 Oct 2014 14:25:12 +0000 Subject: [PATCH] More threads/endpoints for the badges backend. --- inventory/group_vars/badges-backend | 3 ++- inventory/group_vars/badges-backend-stg | 3 ++- roles/badges/backend/templates/badges-awarder.py | 4 ++-- roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/badges-backend b/inventory/group_vars/badges-backend index 5dec56403c..edf2e71006 100644 --- a/inventory/group_vars/badges-backend +++ b/inventory/group_vars/badges-backend @@ -7,7 +7,8 @@ freezes: false # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 3000, 3001, 3002, 3003 ] +tcp_ports: [ 3000, 3001, 3002, 3003, + 3004, 3005, 3006, 3007 ] fas_client_groups: sysadmin-noc,sysadmin-badges diff --git a/inventory/group_vars/badges-backend-stg b/inventory/group_vars/badges-backend-stg index a83475e38d..3b8988c730 100644 --- a/inventory/group_vars/badges-backend-stg +++ b/inventory/group_vars/badges-backend-stg @@ -7,7 +7,8 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 3000, 3001, 3002, 3003 ] +tcp_ports: [ 3000, 3001, 3002, 3003, + 3004, 3005, 3006, 3007 ] fas_client_groups: sysadmin-noc,sysadmin-badges diff --git a/roles/badges/backend/templates/badges-awarder.py b/roles/badges/backend/templates/badges-awarder.py index d99a02cc09..1c6ae21b65 100644 --- a/roles/badges/backend/templates/badges-awarder.py +++ b/roles/badges/backend/templates/badges-awarder.py @@ -5,8 +5,8 @@ config = { # This sets up four threads to handle incoming messages. At the time of # this commit, all of our fedmsg daemons are running in single-threaded # mode. If we turn it on globally, we should remove this setting. - "moksha.workers_per_consumer": 4, - "moksha.threadpool_size": 10, + "moksha.workers_per_consumer": 8, + "moksha.threadpool_size": 20, # This tells the consumer where to look for its BadgeRule definitions. It # may be a relative or an absolute path on the file system. diff --git a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 index a9a69b7c6e..f424d72db5 100644 --- a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 +++ b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 @@ -11,6 +11,10 @@ config = dict( "tcp://badges-backend01.%s:3001" % suffix, "tcp://badges-backend01.%s:3002" % suffix, "tcp://badges-backend01.%s:3003" % suffix, + "tcp://badges-backend01.%s:3004" % suffix, + "tcp://badges-backend01.%s:3005" % suffix, + "tcp://badges-backend01.%s:3006" % suffix, + "tcp://badges-backend01.%s:3007" % suffix, ], "tahrir.badges-web01": [