Keep PostgreSQL directories alive on HF

start.sh

@@ -7,35 +7,56 @@ APP_DATA_DIR=/data/sub2api
 APP_PID=""
 REDIS_PID=""
 
+PG_KEEP_DIRS="
+pg_commit_ts
+pg_dynshmem
+pg_logical
+pg_logical/mappings
+pg_logical/snapshots
+pg_multixact
+pg_multixact/members
+pg_multixact/offsets
+pg_notify
+pg_replslot
+pg_serial
+pg_snapshots
+pg_stat
+pg_stat_tmp
+pg_subtrans
+pg_tblspc
+pg_twophase
+pg_wal
+pg_wal/archive_status
+pg_wal/summaries
+"
+
+ensure_pg_dirs() {
+  for rel in $PG_KEEP_DIRS; do
+    dir="$PGDATA/$rel"
+    marker="$dir/.hf-keep"
+    if [ ! -d "$dir" ]; then
+      mkdir -p "$dir"
+      chown postgres:postgres "$dir"
+      chmod 700 "$dir"
+      echo "Restored PostgreSQL directory: $rel"
+    fi
+    if [ ! -f "$marker" ]; then
+      printf '%s\n' "HF Spaces persistent directory marker" > "$marker"
+      chown postgres:postgres "$marker"
+    fi
+  done
+}
+
+start_postgres() {
+  su-exec postgres pg_ctl -D "$PGDATA" -o "-c listen_addresses=127.0.0.1 -c port=5432 -c unix_socket_directories=/tmp" -w start
+}
+
 if [ -z "$DATABASE_PASSWORD" ]; then
   echo "DATABASE_PASSWORD is required" >&2
   exit 1
 fi
 
 mkdir -p "$PGDATA" "$REDIS_DATA_DIR" "$APP_DATA_DIR"
-
-# Object-backed mounts do not retain empty PostgreSQL directories.
-if [ -s "$PGDATA/PG_VERSION" ]; then
-  mkdir -p \
-    "$PGDATA/pg_commit_ts" \
-    "$PGDATA/pg_dynshmem" \
-    "$PGDATA/pg_logical/mappings" \
-    "$PGDATA/pg_logical/snapshots" \
-    "$PGDATA/pg_multixact/members" \
-    "$PGDATA/pg_multixact/offsets" \
-    "$PGDATA/pg_notify" \
-    "$PGDATA/pg_replslot" \
-    "$PGDATA/pg_serial" \
-    "$PGDATA/pg_snapshots" \
-    "$PGDATA/pg_stat" \
-    "$PGDATA/pg_stat_tmp" \
-    "$PGDATA/pg_subtrans" \
-    "$PGDATA/pg_tblspc" \
-    "$PGDATA/pg_twophase" \
-    "$PGDATA/pg_wal/archive_status" \
-    "$PGDATA/pg_wal/summaries"
-  rm -f "$PGDATA/postmaster.pid"
-fi
 chown -R postgres:postgres "$PGDATA"
 chmod 700 "$PGDATA"
 chown -R redis:redis "$REDIS_DATA_DIR"
@@ -50,7 +71,9 @@ if [ ! -s "$PGDATA/PG_VERSION" ]; then
   rm -f "$PASSWORD_FILE"
 fi
 
-su-exec postgres pg_ctl -D "$PGDATA" -o "-c listen_addresses=127.0.0.1 -c port=5432 -c unix_socket_directories=/tmp" -w start
+rm -f "$PGDATA/postmaster.pid"
+ensure_pg_dirs
+start_postgres
 
 if ! su-exec postgres psql -h /tmp -U "$DATABASE_USER" -d postgres -tAc "SELECT 1 FROM pg_database WHERE datname = 'sub2api'" | grep -q 1; then
   su-exec postgres createdb -h /tmp -U "$DATABASE_USER" -O "$DATABASE_USER" "$DATABASE_DBNAME"
@@ -95,79 +118,21 @@ done
 
 su-exec sub2api /app/sub2api &
 APP_PID=$!
-wait "$APP_PID"
-#!/bin/sh
-set -eu
-
-PGDATA=/data/postgresql
-REDIS_DATA_DIR=/data/redis
-APP_DATA_DIR=/data/sub2api
-APP_PID=""
-REDIS_PID=""
-
-if [ -z "$DATABASE_PASSWORD" ]; then
-  echo "DATABASE_PASSWORD is required" >&2
-  exit 1
-fi
-
-mkdir -p "$PGDATA" "$REDIS_DATA_DIR" "$APP_DATA_DIR"
-chown -R postgres:postgres "$PGDATA"
-chmod 700 "$PGDATA"
-chown -R redis:redis "$REDIS_DATA_DIR"
-chown -R sub2api:sub2api "$APP_DATA_DIR"
-
-if [ ! -s "$PGDATA/PG_VERSION" ]; then
-  PASSWORD_FILE=$(mktemp)
-  chmod 600 "$PASSWORD_FILE"
-  printf '%s\n' "$DATABASE_PASSWORD" > "$PASSWORD_FILE"
-  chown postgres:postgres "$PASSWORD_FILE"
-  su-exec postgres initdb -D "$PGDATA" -U "$DATABASE_USER" --pwfile="$PASSWORD_FILE" --auth-local=trust --auth-host=scram-sha-256
-  rm -f "$PASSWORD_FILE"
-fi
-
-su-exec postgres pg_ctl -D "$PGDATA" -o "-c listen_addresses=127.0.0.1 -c port=5432 -c unix_socket_directories=/tmp" -w start
-
-if ! su-exec postgres psql -h /tmp -U "$DATABASE_USER" -d postgres -tAc "SELECT 1 FROM pg_database WHERE datname = 'sub2api'" | grep -q 1; then
-  su-exec postgres createdb -h /tmp -U "$DATABASE_USER" -O "$DATABASE_USER" "$DATABASE_DBNAME"
-fi
-
-su-exec redis redis-server \
-  --bind 127.0.0.1 \
-  --port 6379 \
-  --dir "$REDIS_DATA_DIR" \
-  --save 60 1 \
-  --appendonly yes \
-  --appendfsync everysec &
-REDIS_PID=$!
-
-cleanup() {
-  trap - EXIT INT TERM
-  if [ -n "$APP_PID" ] && kill -0 "$APP_PID" 2>/dev/null; then
-    kill -TERM "$APP_PID" 2>/dev/null || true
-    wait "$APP_PID" 2>/dev/null || true
-  fi
-  if [ -n "$REDIS_PID" ] && kill -0 "$REDIS_PID" 2>/dev/null; then
-    kill -TERM "$REDIS_PID" 2>/dev/null || true
-    wait "$REDIS_PID" 2>/dev/null || true
-  fi
-  su-exec postgres pg_ctl -D "$PGDATA" -m fast -w stop >/dev/null 2>&1 || true
-}
-trap cleanup EXIT INT TERM
 
-attempt=0
-until redis-cli -h 127.0.0.1 -p 6379 ping 2>/dev/null | grep -q PONG; do
-  if ! kill -0 "$REDIS_PID" 2>/dev/null; then
-    echo "Redis failed to start" >&2
-    exit 1
+while kill -0 "$APP_PID" 2>/dev/null; do
+  ensure_pg_dirs
+  if ! su-exec postgres pg_ctl -D "$PGDATA" status >/dev/null 2>&1; then
+    echo "PostgreSQL stopped unexpectedly; attempting recovery" >&2
+    rm -f "$PGDATA/postmaster.pid"
+    if ! start_postgres; then
+      echo "PostgreSQL recovery failed; stopping Sub2API" >&2
+      kill -TERM "$APP_PID" 2>/dev/null || true
+      wait "$APP_PID" 2>/dev/null || true
+      exit 1
+    fi
+    echo "PostgreSQL recovered"
   fi
-  attempt=$((attempt + 1))
-  if [ "$attempt" -ge 30 ]; then
-    echo "Redis readiness check timed out" >&2
-    exit 1
-  fi
-  sleep 1
+  sleep 5
 done
 
-su-exec sub2api /app/sub2api &
-APP_PID=$!
 wait "$APP_PID"