Koschei: split resolver into build-resolver and repo-resolver

inventory/group_vars/koschei-backend

@@ -57,9 +57,3 @@ csi_relationship: |
     - pkgdb2
     - bastion (for mail relay)
     - memcached01
-
-koschei_backend_services:
-  - koschei-polling
-  - koschei-resolver
-  - koschei-scheduler
-  - koschei-watcher

roles/fedmsg/base/templates/endpoints.py.j2

@@ -47,14 +47,15 @@ config = dict(
         ],
 {% endif %}
 
-        # mizdebsk says he thinks we'll need four sockets.  Two services
+        # mizdebsk says he thinks we'll need five sockets. Three services
-        # (koschei-resolver and koschei-polling) are only sending messages, one
+        # (koschei-{build,repo}-resolver and koschei-polling) are only sending
-        # service (koschei-watcher) can both send and receive them.  The wsgi
+        # messages, one service (koschei-watcher) can both send and receive
-        # webapp doesn't use fedmsg at all and all services are single-threaded
+        # them.  The wsgi webapp doesn't use fedmsg at all and all services are
+        # single-threaded
         # koschei-watcher uses two endpoints
         "koschei.koschei-backend01": [
             "tcp://koschei-backend01.%s:30%02i" % (suffix, i)
-            for i in range(4)
+            for i in range(5)
         ],
 
         # koji is not listed here since it publishes to the fedmsg-relay

roles/koschei/backend/files/systemd-memory-limit.conf

@@ -1,2 +1,2 @@
 [Service]
-MemoryLimit=3G
+MemoryLimit=2G

roles/koschei/backend/handlers/main.yml

@@ -4,8 +4,11 @@
 - name: restart koschei-polling
   action: service name=koschei-polling state=restarted
 
-- name: restart koschei-resolver
+- name: restart koschei-build-resolver
-  action: service name=koschei-resolver state=restarted
+  action: service name=koschei-build-resolver state=restarted
+
+- name: restart koschei-repo-resolver
+  action: service name=koschei-repo-resolver state=restarted
 
 - name: restart koschei-scheduler
   action: service name=koschei-scheduler state=restarted

roles/koschei/backend/tasks/main.yml

@@ -24,10 +24,14 @@
 - name: install systemd config files
   copy: >
     src=systemd-memory-limit.conf
-    dest=/etc/systemd/system/koschei-resolver.service.d/memory-limit.conf
+    dest=/etc/systemd/system/{{ item }}.service.d/memory-limit.conf
+  with_items:
+  - koschei-build-resolver
+  - koschei-repo-resolver
   notify:
   - reload systemd
-  - restart koschei-resolver
+  - restart koschei-build-resolver
+  - restart koschei-repo-resolver
   tags:
   - koschei
   - config

roles/nagios/client/templates/check_koschei_build_resolver_proc.cfg.j2

@@ -0,0 +1 @@
+command[check_koschei_build_resolver_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u koschei -C koschei-build-r -c 1:1

roles/nagios/client/templates/check_koschei_repo_resolver_proc.cfg.j2

@@ -0,0 +1 @@
+command[check_koschei_repo_resolver_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u koschei -C koschei-repo-re -c 1:1

roles/nagios/client/templates/check_koschei_resolver_proc.cfg.j2

@@ -1 +0,0 @@
-command[check_koschei_resolver_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u koschei -C koschei-resolve -c 1:1

roles/nagios/server/files/nagios/services/koschei.cfg

@@ -7,8 +7,15 @@ define service {
 
 define service {
   host_name             koschei-backend01
-  service_description   koschei-resolver process
+  service_description   koschei-build-resolver process
-  check_command         check_by_nrpe!check_koschei_resolver_proc
+  check_command         check_by_nrpe!check_koschei_build_resolver_proc
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             koschei-backend01
+  service_description   koschei-repo-resolver process
+  check_command         check_by_nrpe!check_koschei_repo_resolver_proc
   use                   defaulttemplate
 }
 

roles/nagios/server/files/nrpe.cfg

@@ -243,7 +243,8 @@ command[check_openvpn_link]=/usr/lib64/nagios/plugins/check_ping -H 192.168.1.41
 command[check_memcache]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -a '/usr/bin/memcached' -u memcached
 command[check_memcache_connect]=/usr/lib64/nagios/plugins/check_memcache_connect
 command[check_koschei_polling_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-polling -c 1:1
-command[check_koschei_resolver_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-resolve -c 1:1
+command[check_koschei_build_resolver_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-build-r -c 1:1
+command[check_koschei_repo_resolver_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-repo-re -c 1:1
 command[check_koschei_scheduler_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-schedul -c 1:1
 command[check_koschei_watcher_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-watcher -c 1:1
 

roles/nagios_client/templates/check_koschei_build_resolver_proc.cfg.j2

@@ -0,0 +1 @@
+command[check_koschei_build_resolver_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u koschei -C koschei-build-r -c 1:1

roles/nagios_client/templates/check_koschei_repo_resolver_proc.cfg.j2

@@ -0,0 +1 @@
+command[check_koschei_repo_resolver_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u koschei -C koschei-repo-re -c 1:1

roles/nagios_client/templates/check_koschei_resolver_proc.cfg.j2

@@ -1 +0,0 @@
-command[check_koschei_resolver_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u koschei -C koschei-resolve -c 1:1

roles/nagios_server/files/nagios/services/koschei.cfg

@@ -7,8 +7,15 @@ define service {
 
 define service {
   host_name             koschei-backend01.phx2.fedoraproject.org
-  service_description   koschei-resolver process
+  service_description   koschei-build-resolver process
-  check_command         check_by_nrpe!check_koschei_resolver_proc
+  check_command         check_by_nrpe!check_koschei_build_resolver_proc
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             koschei-backend01.phx2.fedoraproject.org
+  service_description   koschei-repo-resolver process
+  check_command         check_by_nrpe!check_koschei_repo_resolver_proc
   use                   defaulttemplate
 }
 

roles/nagios_server/files/nrpe/nrpe.cfg

@@ -338,7 +338,8 @@ command[check_openvpn_link]=/usr/lib64/nagios/plugins/check_ping -H 192.168.1.41
 command[check_memcache]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -a '/usr/bin/memcached' -u memcached
 command[check_memcache_connect]=/usr/lib64/nagios/plugins/check_memcache_connect
 command[check_koschei_polling_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-polling -c 1:1
-command[check_koschei_resolver_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-resolve -c 1:1
+command[check_koschei_build_resolver_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-build-r -c 1:1
+command[check_koschei_repo_resolver_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-repo-re -c 1:1
 command[check_koschei_scheduler_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-schedul -c 1:1
 command[check_koschei_watcher_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-watcher -c 1:1