From 32df86f029ad9674f9f5e3e4a32c8781caeaff82 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 19 Apr 2021 12:09:38 +0100 Subject: [PATCH 1/6] Set Synapse's worker configuration We've removed '*' as it stopped making sense after we started allowing multiple instances of the same worker to be specified. This list of workers is ripped from SyTest. --- dockerfiles/SynapseWorkers.Dockerfile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile index be07fc9d..e3927312 100644 --- a/dockerfiles/SynapseWorkers.Dockerfile +++ b/dockerfiles/SynapseWorkers.Dockerfile @@ -46,8 +46,21 @@ ENTRYPOINT \ SYNAPSE_REPORT_STATS=no \ # Set postgres authentication details which will be placed in the homeserver config file POSTGRES_PASSWORD=somesecret POSTGRES_USER=postgres POSTGRES_HOST=localhost \ - # Use all available worker types - SYNAPSE_WORKERS=* \ + # Specify the workers to test with + SYNAPSE_WORKERS=\ + event_persister, \ + event_persister, \ + background_worker, \ + frontend_proxy, \ + event_creator, \ + user_dir, \ + client_reader, \ + media_repo, \ + federation_reader, \ + federation_sender, \ + synchrotron, \ + appservice, \ + pusher \ # Run the script that writes the necessary config files and starts supervisord, which in turn # starts everything else /configure_workers_and_start.py From 9077db06eab052ce86f9352b7cd9c02355bbb0a0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 19 Apr 2021 15:26:42 +0100 Subject: [PATCH 2/6] Switch from synapse:workers to synapse-workers --- dockerfiles/SynapseWorkers.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile index e3927312..e2ac03f0 100644 --- a/dockerfiles/SynapseWorkers.Dockerfile +++ b/dockerfiles/SynapseWorkers.Dockerfile @@ -1,6 +1,6 @@ # This dockerfile builds on top of Dockerfile-worker and includes a built-in postgres instance # as well as sets up the homeserver so that it is ready for testing via Complement -FROM matrixdotorg/synapse:workers +FROM matrixdotorg/synapse-workers # Download a caddy server to stand in front of nginx and terminate TLS using Complement's # custom CA. From 6f5c0e9f136e9aad5853af731a18e2b2bc5af028 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 23 Apr 2021 19:07:00 +0100 Subject: [PATCH 3/6] SYNAPSE_WORKERS -> SYNAPSE_WORKER_TYPES --- dockerfiles/SynapseWorkers.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile index e2ac03f0..f2076e93 100644 --- a/dockerfiles/SynapseWorkers.Dockerfile +++ b/dockerfiles/SynapseWorkers.Dockerfile @@ -47,7 +47,7 @@ ENTRYPOINT \ # Set postgres authentication details which will be placed in the homeserver config file POSTGRES_PASSWORD=somesecret POSTGRES_USER=postgres POSTGRES_HOST=localhost \ # Specify the workers to test with - SYNAPSE_WORKERS=\ + SYNAPSE_WORKER_TYPES=\ event_persister, \ event_persister, \ background_worker, \ From 3cf294b79bd3106e16ad6e6178d6e833eb869f82 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 26 Apr 2021 14:34:17 +0100 Subject: [PATCH 4/6] media_repo -> media_repository, add federation_inbound --- dockerfiles/SynapseWorkers.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile index f2076e93..70b9b17e 100644 --- a/dockerfiles/SynapseWorkers.Dockerfile +++ b/dockerfiles/SynapseWorkers.Dockerfile @@ -55,7 +55,8 @@ ENTRYPOINT \ event_creator, \ user_dir, \ client_reader, \ - media_repo, \ + media_repository, \ + federation_inbound, \ federation_reader, \ federation_sender, \ synchrotron, \ From ffb3531cff376dbc7ac76345f6554f34e97f1b2b Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 27 Apr 2021 11:31:45 +0100 Subject: [PATCH 5/6] Ensure worker contents get fully captured by env var --- dockerfiles/SynapseWorkers.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile index 70b9b17e..febcce4a 100644 --- a/dockerfiles/SynapseWorkers.Dockerfile +++ b/dockerfiles/SynapseWorkers.Dockerfile @@ -47,7 +47,7 @@ ENTRYPOINT \ # Set postgres authentication details which will be placed in the homeserver config file POSTGRES_PASSWORD=somesecret POSTGRES_USER=postgres POSTGRES_HOST=localhost \ # Specify the workers to test with - SYNAPSE_WORKER_TYPES=\ + SYNAPSE_WORKER_TYPES="\ event_persister, \ event_persister, \ background_worker, \ @@ -61,7 +61,7 @@ ENTRYPOINT \ federation_sender, \ synchrotron, \ appservice, \ - pusher \ + pusher" \ # Run the script that writes the necessary config files and starts supervisord, which in turn # starts everything else /configure_workers_and_start.py From 6424149fb46426066fe1260f1958b960a1fe598e Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 27 Apr 2021 11:36:05 +0100 Subject: [PATCH 6/6] client_reader doesn't actually exist yet --- dockerfiles/SynapseWorkers.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile index febcce4a..56cc41d9 100644 --- a/dockerfiles/SynapseWorkers.Dockerfile +++ b/dockerfiles/SynapseWorkers.Dockerfile @@ -54,7 +54,6 @@ ENTRYPOINT \ frontend_proxy, \ event_creator, \ user_dir, \ - client_reader, \ media_repository, \ federation_inbound, \ federation_reader, \