finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add synapse-auto-compressor workaround, fixes #3397 (#3473)

Browse Source 
* add synapse-auto-compressor workaround, fixes #3397

* Clarify what the PG-prefixed variables are for

---------

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
This commit is contained in:
Aine
2024-08-15 11:36:48 +03:00
committed by GitHub
parent 332301f2ed
commit 70cbf3d5ae
6 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/custom/matrix-synapse-auto-compressor/templates/env.j2
View File

@ -1 +1,7 @@
POSTGRES_LOCATION={{ matrix_synapse_auto_compressor_environment_variable_postgres_location }}
# PG-prefixed variables below are for the matrix-synapse-auto-compressor-fix.sh script
PGHOST={{ matrix_synapse_auto_compressor_database_hostname }}
PGDATABASE={{ matrix_synapse_auto_compressor_database_name }}
PGUSER={{ matrix_synapse_auto_compressor_database_username }}
PGPASSWORD={{ matrix_synapse_auto_compressor_database_password }}

47
roles/custom/matrix-synapse-auto-compressor/templates/matrix-synapse-auto-compressor-fix.sh.j2 Normal file
View File

@ -0,0 +1,47 @@
#jinja2: lstrip_blocks: "True"
#!/bin/bash
# this script is used to workaround the https://github.com/matrix-org/rust-synapse-compress-state/issues/78,
# and it is based on postgres' cli-non-interactive and https://github.com/matrix-org/rust-synapse-compress-state/issues/78#issuecomment-1409932869
docker run \
--rm \
--user={{ matrix_synapse_auto_compressor_uid }}:{{ matrix_synapse_auto_compressor_gid }} \
--cap-drop=ALL \
--interactive \
--network={{ matrix_synapse_auto_compressor_container_network }} \
--env-file={{ matrix_synapse_auto_compressor_base_path }}/env \
{{ matrix_synapse_auto_compressor_postgres_image }} \
psql -h {{ matrix_synapse_auto_compressor_database_hostname }} \
<<_EOF
BEGIN;
DELETE
FROM state_compressor_state AS scs
WHERE NOT EXISTS
(SELECT *
FROM rooms AS r
WHERE r.room_id = scs.room_id);
DELETE
FROM state_compressor_state AS scs
WHERE scs.room_id in
(SELECT DISTINCT room_id
FROM state_compressor_state AS scs2
WHERE scs2.current_head IS NOT NULL
AND NOT EXISTS
(SELECT *
FROM state_groups AS sg
WHERE sg.id = scs2.current_head));
DELETE
FROM state_compressor_progress AS scp
WHERE NOT EXISTS
(SELECT *
FROM state_compressor_state AS scs
WHERE scs.room_id = scp.room_id);
COMMIT;
_EOF
# vim: ft=sh

3
roles/custom/matrix-synapse-auto-compressor/templates/matrix-synapse-auto-compressor.service.j2
View File

@ -15,6 +15,7 @@ Type=oneshot
Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-synapse-auto-compressor 2>/dev/null || true'
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-synapse-auto-compressor 2>/dev/null || true'
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} {{ matrix_synapse_auto_compressor_base_path }}/matrix-synapse-auto-compressor-fix.sh
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--rm \
@ -22,7 +23,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--log-driver=none \
--cap-drop=ALL \
--read-only \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--user={{ matrix_synapse_auto_compressor_uid }}:{{ matrix_synapse_auto_compressor_gid }} \
--network={{ matrix_synapse_auto_compressor_container_network }} \
--env-file={{ matrix_synapse_auto_compressor_base_path }}/env \
--entrypoint=/bin/sh \