tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Tweaks to workers-under-complement (#12637)

Browse source 
* Bump the HS startup timeout
* Log prefixes for more processes
* Bump the overall timeout
This commit is contained in:
Richard van der Hoff 2022-05-09 22:41:06 +01:00 committed by GitHub
parent bf0c3ca20a
commit 34e84fee68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12637.misc Normal file
View file

@ -0,0 +1 @@
Minor improvements to the scripts for running Synapse in worker mode under Complement.

6
docker/conf-workers/supervisord.conf.j2
View file

@ -9,7 +9,7 @@ user=root
files = /etc/supervisor/conf.d/*.conf files = /etc/supervisor/conf.d/*.conf
[program:nginx] [program:nginx]
command=/usr/sbin/nginx -g "daemon off;" command=/usr/local/bin/prefix-log /usr/sbin/nginx -g "daemon off;"
priority=500 priority=500
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
@ -19,7 +19,7 @@ username=www-data
autorestart=true autorestart=true
[program:redis] [program:redis]
command=/usr/bin/redis-server /etc/redis/redis.conf --daemonize no command=/usr/local/bin/prefix-log /usr/bin/redis-server /etc/redis/redis.conf --daemonize no
priority=1 priority=1
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
@ -29,7 +29,7 @@ username=redis
autorestart=true autorestart=true
[program:synapse_main] [program:synapse_main]
command=/usr/local/bin/python -m synapse.app.homeserver --config-path="{{ main_config_path }}" --config-path=/conf/workers/shared.yaml command=/usr/local/bin/prefix-log /usr/local/bin/python -m synapse.app.homeserver --config-path="{{ main_config_path }}" --config-path=/conf/workers/shared.yaml
priority=10 priority=10
# Log startup failures to supervisord's stdout/err # Log startup failures to supervisord's stdout/err
# Regular synapse logs will still go in the configured data directory # Regular synapse logs will still go in the configured data directory

13
scripts-dev/complement.sh
View file

@ -43,6 +43,8 @@ fi
# Build the base Synapse image from the local checkout # Build the base Synapse image from the local checkout
docker build -t matrixdotorg/synapse -f "docker/Dockerfile" . docker build -t matrixdotorg/synapse -f "docker/Dockerfile" .
extra_test_args=()
# If we're using workers, modify the docker files slightly. # If we're using workers, modify the docker files slightly.
if [[ -n "$WORKERS" ]]; then if [[ -n "$WORKERS" ]]; then
# Build the workers docker image (from the base Synapse image). # Build the workers docker image (from the base Synapse image).
@ -52,7 +54,14 @@ if [[ -n "$WORKERS" ]]; then
COMPLEMENT_DOCKERFILE=SynapseWorkers.Dockerfile COMPLEMENT_DOCKERFILE=SynapseWorkers.Dockerfile
# And provide some more configuration to complement. # And provide some more configuration to complement.
export COMPLEMENT_SPAWN_HS_TIMEOUT_SECS=60
# It can take quite a while to spin up a worker-mode Synapse for the first
# time (the main problem is that we start 14 python processes for each test,
# and complement likes to do two of them in parallel).
export COMPLEMENT_SPAWN_HS_TIMEOUT_SECS=120
# ... and it takes longer than 10m to run the whole suite.
extra_test_args+=("-timeout=60m")
else else
export COMPLEMENT_BASE_IMAGE=complement-synapse export COMPLEMENT_BASE_IMAGE=complement-synapse
COMPLEMENT_DOCKERFILE=Dockerfile COMPLEMENT_DOCKERFILE=Dockerfile
@ -64,4 +73,4 @@ docker build -t $COMPLEMENT_BASE_IMAGE -f "docker/complement/$COMPLEMENT_DOCKERF
# Run the tests! # Run the tests!
echo "Images built; running complement" echo "Images built; running complement"
cd "$COMPLEMENT_DIR" cd "$COMPLEMENT_DIR"
go test -v -tags synapse_blacklist,msc2716,msc3030,faster_joins -count=1 "$@" ./tests/... go test -v -tags synapse_blacklist,msc2716,msc3030,faster_joins -count=1 "${extra_test_args[@]}" "$@" ./tests/...