Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Use supervisord to supervise Postgres and Caddy in the Complement image. #12480

Merged
merged 12 commits into from
Apr 27, 2022
Merged

Use supervisord to supervise Postgres and Caddy in the Complement image. #12480

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c3ae63f
Use supervisord to supervise Postgres and Caddy
reivilibre Apr 14, 2022
93d3d11
Newsfile
reivilibre Apr 14, 2022
19bda05
Prefix log lines with program names
reivilibre Apr 21, 2022
d0d360d
Remove redundant worker name from log config
reivilibre Apr 21, 2022
ea23bcd
Don't use `sh -c` for the entrypoint as it intercepts signals
reivilibre Apr 21, 2022
b390b1c
Merge branch 'develop' into rei/compl_supervise
reivilibre Apr 21, 2022
70b80e3
fixup! Remove redundant worker name from log config
reivilibre Apr 21, 2022
9ef2447
Fix prefix-log path
reivilibre Apr 21, 2022
a65fa98
Use fast shutdown mode for Postgres
reivilibre Apr 21, 2022
0df4a91
Update changelog.d/12480.misc
reivilibre Apr 27, 2022
32ae5e1
Add a comment describing prefix-log
reivilibre Apr 27, 2022
0140327
Give Postgres priority 1 to match Redis
reivilibre Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12480.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use supervisord to supervise Postgres and Caddy in the Complement image.
3 changes: 3 additions & 0 deletions docker/complement/SynapseWorkers.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ WORKDIR /data
# Copy the caddy config
COPY conf-workers/caddy.complement.json /root/caddy.json

COPY conf-workers/postgres.supervisord.conf /etc/supervisor/conf.d/postgres.conf
COPY conf-workers/caddy.supervisord.conf /etc/supervisor/conf.d/caddy.conf

# Copy the entrypoint
COPY conf-workers/start-complement-synapse-workers.sh /

Expand Down
7 changes: 7 additions & 0 deletions docker/complement/conf-workers/caddy.supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[program:caddy]
command=/root/caddy run --config /root/caddy.json
autorestart=unexpected
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
11 changes: 11 additions & 0 deletions docker/complement/conf-workers/postgres.supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[program:postgres]
command=/usr/bin/pg_ctlcluster 13 main start --foreground

# Lower priority number = starts first
priority=100
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

following up on #12480 (comment):

Do we actually need postgres to be a higher prority than synapse? It's not like there's any guarantee that doing so will mean that postgres is ready before synapse starts.

No, though Synapse's configuration already defined it at priority 500 so it seemed like this was the intention.

I'm not sure the priority was particularly carefully chosen, tbh. (ftr, this bit came from #9162).

(I just realised: The main Synapse process' priority is actually defined as 10; Redis' is 1. Postgres should probably be on the same level as Redis if we're going to have priority ordering?)

If we're going to have priority ordering, then yes it ought to be lower than Synapse.

I would have thought that Postgres being up first might avoid some noisy errors in Synapse's logs.

If it actually manages to start up in 1 second, then yes maybe. TBH though I would optimise for fastest runtime rather than lack of noise in the logs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's set this to be the same as Redis for now, and get this PR merged.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh you're way ahead of me


autorestart=unexpected
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
6 changes: 0 additions & 6 deletions docker/complement/conf-workers/start-complement-synapse-workers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ function log {
# Replace the server name in the caddy config
sed -i "s/{{ server_name }}/${SERVER_NAME}/g" /root/caddy.json

log "starting postgres"
pg_ctlcluster 13 main start

log "starting caddy"
/root/caddy start --config /root/caddy.json

# Set the server name of the homeserver
export SYNAPSE_SERVER_NAME=${SERVER_NAME}

Expand Down