This switches the `docker exec` method of spawning Synapse workers inside the `matrix-synapse` container with dedicated containers for each worker. We also have dedicated systemd services for each worker, so this are now: - more consistent with everything else (we don't use systemd instantiated services anywhere) - we don't need the "parse systemd instance name into worker name + port" part - we don't need to keep track of PIDs manually - we don't need jq (less depenendencies) - workers dying would be restarted by systemd correctly, like any other service - `docker ps` shows each worker separately and we can observe resource usagedevelopment
Slavi Pantaleev
4 years ago
parent
da50fb27a0
commit
70796703d3
@ -1,30 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Find a synapse worker's PID and write it to a file so systemd can manage it as a service
|
|
||||||
|
|
||||||
# example invocation:
|
|
||||||
# matrix-synapse-worker-write-pid user_dir:18700 /run/matrix-synapse-worker.user_dir:18700.pid
|
|
||||||
|
|
||||||
docker_api_call() { curl --silent --unix-socket /var/run/docker.sock ${@}; }
|
|
||||||
|
|
||||||
TARGETCONTAINER=matrix-synapse
|
|
||||||
TARGETWORKER=${1}
|
|
||||||
PIDFILE=${2}
|
|
||||||
|
|
||||||
# get ID list of subprocesses executed in $TARGETCONTAINER, and for each..
|
|
||||||
for EXECID in $(docker_api_call http://localhost/containers/${TARGETCONTAINER}/json | jq --raw-output '.ExecIDs[]')
|
|
||||||
do
|
|
||||||
# fetch detailed process info
|
|
||||||
EXECINFO=$(docker_api_call http://localhost/exec/${EXECID}/json)
|
|
||||||
|
|
||||||
# extract config file path from last command argument
|
|
||||||
WORKERCONFIGFILE=$(echo ${EXECINFO} | jq --raw-output .ProcessConfig.arguments[-1])
|
|
||||||
|
|
||||||
# reconstruct worker name
|
|
||||||
WORKERNAME=${WORKERCONFIGFILE#*/worker.}
|
|
||||||
WORKERNAME=${WORKERNAME%.yaml}
|
|
||||||
|
|
||||||
# if name matches the target worker: write out most recent PID & quit
|
|
||||||
[ "${WORKERNAME}" = "${TARGETWORKER}" ] \
|
|
||||||
&& echo ${EXECINFO} | jq --raw-output .Pid > ${PIDFILE} \
|
|
||||||
&& exit 0
|
|
||||||
done
|
|
||||||
@ -1,81 +1,33 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: Ensure synapse worker base service file installed
|
|
||||||
template:
|
|
||||||
src: "{{ role_path }}/templates/synapse/systemd/matrix-synapse-worker@.service.j2"
|
|
||||||
dest: "{{ matrix_systemd_path }}/matrix-synapse-worker@.service"
|
|
||||||
mode: 0644
|
|
||||||
register: matrix_synapse_worker_systemd_service_result
|
|
||||||
|
|
||||||
- name: Ensure previous worker service symlinks are cleaned
|
|
||||||
file:
|
|
||||||
path: "{{ item.root + '/' + item.path }}"
|
|
||||||
state: absent
|
|
||||||
when:
|
|
||||||
- item.state == 'link'
|
|
||||||
- item.path is match('matrix-synapse-worker@.*\\.service')
|
|
||||||
with_filetree:
|
|
||||||
- "{{ matrix_systemd_path }}/matrix-synapse.service.wants"
|
|
||||||
|
|
||||||
- name: Ensure systemd reloaded the worker service unit
|
|
||||||
service:
|
|
||||||
daemon_reload: yes
|
|
||||||
|
|
||||||
- name: Ensure individual worker service symlinks exist
|
|
||||||
service:
|
|
||||||
name: "matrix-synapse-worker@{{ item.type }}:{{ item.port }}.service"
|
|
||||||
enabled: true
|
|
||||||
with_items: "{{ matrix_synapse_workers_enabled_list }}"
|
|
||||||
|
|
||||||
- name: Find worker configs to be cleaned
|
- name: Find worker configs to be cleaned
|
||||||
find:
|
find:
|
||||||
path: "{{ matrix_synapse_config_dir_path }}"
|
path: "{{ matrix_synapse_config_dir_path }}"
|
||||||
patterns: "worker.*.yaml"
|
patterns: "worker.*.yaml"
|
||||||
use_regex: true
|
use_regex: true
|
||||||
register: worker_config_files
|
register: matrix_synapse_workers_current_config_files
|
||||||
|
|
||||||
- name: Ensure previous worker configs are cleaned
|
- name: Ensure previous worker configs are cleaned
|
||||||
file:
|
file:
|
||||||
path: "{{ item.path }}"
|
path: "{{ item.path }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: "{{ worker_config_files.files }}"
|
with_items: "{{ matrix_synapse_workers_current_config_files.files }}"
|
||||||
|
|
||||||
- name: Ensure creation of specific worker configs
|
- name: Find worker systemd services to be cleaned
|
||||||
template:
|
find:
|
||||||
src: "{{ role_path }}/templates/synapse/worker.yaml.j2"
|
path: "{{ matrix_systemd_path }}"
|
||||||
dest: "{{ matrix_synapse_config_dir_path }}/worker.{{ item.type }}:{{ item.port }}.yaml"
|
patterns: "matrix-synapse-worker.*.service"
|
||||||
with_list: "{{ matrix_synapse_workers_enabled_list }}"
|
use_regex: true
|
||||||
|
register: matrix_synapse_workers_current_systemd_services
|
||||||
- name: Add workers to synapse.wants list
|
|
||||||
set_fact:
|
|
||||||
matrix_synapse_systemd_wanted_services_list: >
|
|
||||||
{{ matrix_synapse_systemd_wanted_services_list +
|
|
||||||
['matrix-synapse-worker@' + item.type + ':' + item.port|string + '.service'] }}
|
|
||||||
with_items: "{{ matrix_synapse_workers_enabled_list }}"
|
|
||||||
|
|
||||||
- name: Ensure matrix-synapse-worker-write-pid script is created
|
|
||||||
copy:
|
|
||||||
src: "{{ role_path }}/files/usr-local-bin/matrix-synapse-worker-write-pid"
|
|
||||||
dest: "{{ matrix_local_bin_path }}/matrix-synapse-worker-write-pid"
|
|
||||||
mode: 0750
|
|
||||||
|
|
||||||
- name: Ensure jq is installed (Archlinux)
|
|
||||||
pacman:
|
|
||||||
name:
|
|
||||||
- jq
|
|
||||||
state: present
|
|
||||||
when: (ansible_distribution == 'Archlinux')
|
|
||||||
|
|
||||||
- name: Ensure jq is installed (CentOS)
|
- name: Ensure previous worker systemd services are cleaned
|
||||||
yum:
|
file:
|
||||||
name:
|
path: "{{ item.path }}"
|
||||||
- jq
|
state: absent
|
||||||
state: present
|
with_items: "{{ matrix_synapse_workers_current_systemd_services.files }}"
|
||||||
when: (ansible_distribution == 'CentOS')
|
|
||||||
|
|
||||||
- name: Ensure jq is installed (Debian)
|
- name: Ensure creation of worker systemd service files and configuration files
|
||||||
apt:
|
include_tasks: "{{ role_path }}/tasks/workers/util/setup_files_for_worker.yml"
|
||||||
name:
|
with_items: "{{ matrix_synapse_workers_enabled_list }}"
|
||||||
- jq
|
loop_control:
|
||||||
state: present
|
loop_var: matrix_synapse_worker_details
|
||||||
when: (ansible_os_family == 'Debian')
|
|
||||||
|
|||||||
@ -0,0 +1,6 @@
|
|||||||
|
|
||||||
|
- set_fact:
|
||||||
|
matrix_synapse_worker_systemd_service_name: "matrix-synapse-worker-{{ matrix_synapse_worker_details.type }}-{{ matrix_synapse_worker_details.port }}.service"
|
||||||
|
|
||||||
|
- set_fact:
|
||||||
|
matrix_systemd_services_list: "{{ matrix_systemd_services_list + [matrix_synapse_worker_systemd_service_name] }}"
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
|
||||||
|
- set_fact:
|
||||||
|
matrix_synapse_worker_systemd_service_name: "matrix-synapse-worker-{{ matrix_synapse_worker_details.type }}-{{ matrix_synapse_worker_details.port }}"
|
||||||
|
|
||||||
|
- set_fact:
|
||||||
|
matrix_synapse_worker_container_name: "{{ matrix_synapse_worker_systemd_service_name }}"
|
||||||
|
|
||||||
|
- set_fact:
|
||||||
|
matrix_synapse_worker_config_file_name: "worker.{{ matrix_synapse_worker_details.type }}_{{ matrix_synapse_worker_details.port }}.yaml"
|
||||||
|
|
||||||
|
- name: Ensure configuration exists for {{ matrix_synapse_worker_systemd_service_name }}
|
||||||
|
template:
|
||||||
|
src: "{{ role_path }}/templates/synapse/worker.yaml.j2"
|
||||||
|
dest: "{{ matrix_synapse_config_dir_path }}/{{ matrix_synapse_worker_config_file_name }}"
|
||||||
|
|
||||||
|
- name: Ensure systemd service exists for {{ matrix_synapse_worker_systemd_service_name }}
|
||||||
|
template:
|
||||||
|
src: "{{ role_path }}/templates/synapse/systemd/matrix-synapse-worker.service.j2"
|
||||||
|
dest: "{{ matrix_systemd_path }}/{{ matrix_synapse_worker_systemd_service_name }}.service"
|
||||||
|
mode: 0644
|
||||||
Loading…
Reference in new issue