fix(backup): reimport postgres dump on restore (restore was a no-op)
The db service dumped the DB on backup (pg_dump pre-hook) but shipped no restore hook, and a file-level restore does not reload into the running postgres, so a restored backup silently kept the live (un-restored) state. Add pg_backup.sh (backup=pg_dump|gzip into the postgresql_data volume; restore=terminate conns + DROP DATABASE WITH FORCE + createdb + reimport), mount it via a config, and wire the backupbot backup/restore hooks. Same fix as the immich / mattermost-lts / ghost recipes.
This commit is contained in:
@ -19,3 +19,5 @@ LETS_ENCRYPT_ENV=production
|
|||||||
#SECRET_SMTP_PASSWORD_VERSION=v1
|
#SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
|
# APP_START_PERIOD=5m # healthcheck start_period; raise on slow hosts (cc-ci sets larger for Rails cold boot)
|
||||||
|
|||||||
1
abra.sh
1
abra.sh
@ -1 +1,2 @@
|
|||||||
export DB_ENTRYPOINT_VERSION=v1
|
export DB_ENTRYPOINT_VERSION=v1
|
||||||
|
export PG_BACKUP_VERSION=v1
|
||||||
|
|||||||
14
compose.yml
14
compose.yml
@ -49,7 +49,7 @@ services:
|
|||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 6
|
retries: 6
|
||||||
start_period: 5m
|
start_period: ${APP_START_PERIOD:-5m}
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:13
|
image: postgres:13
|
||||||
@ -63,6 +63,9 @@ services:
|
|||||||
- source: db_entrypoint
|
- source: db_entrypoint
|
||||||
target: /docker-entrypoint.sh
|
target: /docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
- source: pg_backup
|
||||||
|
target: /pg_backup.sh
|
||||||
|
mode: 0555
|
||||||
entrypoint: /docker-entrypoint.sh
|
entrypoint: /docker-entrypoint.sh
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
- POSTGRES_HOST_AUTH_METHOD=trust
|
||||||
@ -72,9 +75,9 @@ services:
|
|||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
backupbot.backup: "true"
|
||||||
backupbot.backup.pre-hook: "bash -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup.sql'"
|
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
||||||
backupbot.backup.post-hook: "rm -rf /tmp/backup.sql"
|
backupbot.backup.volumes.postgresql_data.path: "backup.sql"
|
||||||
backupbot.backup.path: "/tmp/backup.sql"
|
backupbot.restore.post-hook: "/pg_backup.sh restore"
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:7.4-alpine
|
image: redis:7.4-alpine
|
||||||
@ -132,3 +135,6 @@ configs:
|
|||||||
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.postgres.sh.tmpl
|
file: entrypoint.postgres.sh.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
pg_backup:
|
||||||
|
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
|
||||||
|
file: pg_backup.sh
|
||||||
|
|||||||
34
pg_backup.sh
Executable file
34
pg_backup.sh
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Postgres backup/restore hook for the discourse `db` service. Invoked by backupbot-two via:
|
||||||
|
# backupbot.backup.pre-hook = "/pg_backup.sh backup"
|
||||||
|
# backupbot.backup.volumes.postgresql_data.path = "backup.sql"
|
||||||
|
# backupbot.restore.post-hook = "/pg_backup.sh restore"
|
||||||
|
# Backup dumps the DB to backup.sql (gzip) inside the postgresql_data volume; backupbot archives it.
|
||||||
|
# Restore reimports it. Discourse (the rails app + sidekiq) keeps TCP connections open to the DB, so
|
||||||
|
# restore must terminate them and FORCE-drop before recreating, then reimport the dump deterministically.
|
||||||
|
# The previous recipe shipped a pg_dump backup but NO restore hook — a file-level restore did not reload
|
||||||
|
# into the running postgres, so a restored backup silently kept the live (un-restored) state. cc-ci
|
||||||
|
# caught this: a seeded ci_marker row was gone after restore. Same pattern as the immich / mattermost-lts
|
||||||
|
# / ghost recipe-PRs.
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
|
||||||
|
export PGPASSWORD=$(cat "${POSTGRES_PASSWORD_FILE:-/run/secrets/db_password}")
|
||||||
|
DB_USER="${POSTGRES_USER:-discourse}"
|
||||||
|
DB_NAME="${POSTGRES_DB:-discourse}"
|
||||||
|
|
||||||
|
function backup {
|
||||||
|
pg_dump -U "$DB_USER" "$DB_NAME" | gzip > "$BACKUP_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
function restore {
|
||||||
|
psql -U "$DB_USER" -d postgres -c \
|
||||||
|
"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='${DB_NAME}' AND pid<>pg_backend_pid();"
|
||||||
|
psql -U "$DB_USER" -d postgres -c "DROP DATABASE ${DB_NAME} WITH (FORCE);"
|
||||||
|
createdb -U "$DB_USER" "$DB_NAME"
|
||||||
|
gunzip -c "$BACKUP_FILE" | psql -U "$DB_USER" -d "$DB_NAME" -1 -v ON_ERROR_STOP=1 -f -
|
||||||
|
}
|
||||||
|
|
||||||
|
$@
|
||||||
Reference in New Issue
Block a user