From 720faa0bebc46a34857b2933df1924ccabbd4087 Mon Sep 17 00:00:00 2001
From: autonomic-bot <autonomic-bot@autonomic.zone>
Date: Tue, 2 Jun 2026 08:21:04 +0000
Subject: [PATCH] fix(backup): proper backup/restore hooks + healthcheck
 start_period
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add mysql_backup.sh: mysqldump to backup.sql.gz with proper restore hook
  (old --tab backup had no restore hook → restored backup silently lost DB data)
- Update db backupbot labels: pre-hook → /mysql_backup.sh backup,
  restore.post-hook → /mysql_backup.sh restore
- Fix app healthcheck start_period 1m → 15m (Ghost fresh-DB migration takes ~6-9min
  on slow hosts; old 1m caused migration lock deadlocks on deploy)
- Fix db healthcheck start_period 1m → 15m (InnoDB init on fresh data dir ~6-10min)
- Add MYSQL_BACKUP_VERSION=v1 to abra.sh
---
 abra.sh         |  3 ++-
 compose.yml     | 19 +++++++++++++------
 mysql_backup.sh | 28 ++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100755 mysql_backup.sh

diff --git a/abra.sh b/abra.sh
index d6cf678..30b222f 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1 +1,2 @@
-export GHOST_ENTRYPOINT_VERSION=v1
\ No newline at end of file
+export GHOST_ENTRYPOINT_VERSION=v1
+export MYSQL_BACKUP_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 143561e..25162bc 100644
--- a/compose.yml
+++ b/compose.yml
@@ -57,7 +57,7 @@ services:
       interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 1m
+      start_period: 15m
  
   db:
     image: mysql:8.0
@@ -67,21 +67,25 @@ services:
       MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_password
     secrets:
       - db_password
+    configs:
+      - source: mysql_backup
+        target: /mysql_backup.sh
+        mode: 0555
     volumes:
       - "mysql:/var/lib/mysql"
     deploy:
       labels:
         - "backupbot.backup=true"
-        - "backupbot.backup.pre-hook=mysqldump -u root -p\"$$(cat /run/secrets/db_password)\" ghost --tab /var/lib/mysql-files/"
-        - "backupbot.backup.post-hook=rm -rf /var/lib/mysql-files/*"
-        - "backupbot.backup.path=/var/lib/mysql-files/"
+        - "backupbot.backup.pre-hook=/mysql_backup.sh backup"
+        - "backupbot.backup.volumes.mysql.path=backup.sql.gz"
+        - "backupbot.restore.post-hook=/mysql_backup.sh restore"
 
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p\"$$(cat /run/secrets/db_password)\""]
       interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 1m
+      start_period: 15m
 
 networks:
   proxy:
@@ -103,4 +107,7 @@ secrets:
 configs:
   ghost_entrypoint:
     name: ${STACK_NAME}_ghost_entrypoint_${GHOST_ENTRYPOINT_VERSION}
-    file: entrypoint.sh
\ No newline at end of file
+    file: entrypoint.sh
+  mysql_backup:
+    name: ${STACK_NAME}_mysql_backup_${MYSQL_BACKUP_VERSION}
+    file: mysql_backup.sh
\ No newline at end of file
diff --git a/mysql_backup.sh b/mysql_backup.sh
new file mode 100755
index 0000000..10a58b4
--- /dev/null
+++ b/mysql_backup.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# MySQL backup/restore hook for the `db` service. Invoked by backupbot-two via:
+#   backupbot.backup.pre-hook   = "/mysql_backup.sh backup"
+#   backupbot.backup.path       = "/var/lib/mysql/backup.sql.gz"
+#   backupbot.restore.post-hook = "/mysql_backup.sh restore"
+# Backup dumps the `ghost` DB to a single gzipped file inside the mysql data volume; backupbot
+# archives it. Restore reimports it. The previous recipe shipped a `mysqldump --tab` backup with NO
+# restore hook (and the mysql data volume itself was not backed up), so a restored backup silently
+# kept the live, un-restored DB state — data loss on restore.
+
+set -e
+
+BACKUP_FILE="/var/lib/mysql/backup.sql.gz"
+export MYSQL_PWD="$(cat "${MYSQL_ROOT_PASSWORD_FILE:-/run/secrets/db_password}")"
+DB_NAME="ghost"
+
+function backup {
+  mysqldump -u root --single-transaction --routines --triggers --databases "$DB_NAME" | gzip > "$BACKUP_FILE"
+}
+
+function restore {
+  # --databases dump carries CREATE DATABASE/USE + per-table DROP+CREATE (mysqldump default), so the
+  # reimport deterministically rebuilds every table from the archived dump.
+  gunzip -c "$BACKUP_FILE" | mysql -u root
+}
+
+$@