Upload hf-entrypoint.sh

hf-entrypoint.sh

@@ -56,32 +56,78 @@ if command -v psql >/dev/null 2>&1; then
 fi
 
 # sub2api AutoSetup currently uses a hard 60s migration context.
-# Migration 033 may exceed this on remote managed PostgreSQL.
-# Pre-apply 033 once (without recording schema_migrations) so the real runner
-# can re-run it quickly and record checksum in its own flow.
-if command -v psql >/dev/null 2>&1 && command -v curl >/dev/null 2>&1; then
-  SCHEMA_MIGRATIONS_EXISTS=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT to_regclass('public.schema_migrations') IS NOT NULL" 2>/dev/null | tr -d '[:space:]' || true)
-  if [ "${SCHEMA_MIGRATIONS_EXISTS}" = "true" ]; then
-    MIG_033_APPLIED=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT 1 FROM schema_migrations WHERE filename='033_ops_monitoring_vnext.sql' LIMIT 1" 2>/dev/null | tr -d '[:space:]' || true)
+# Pre-apply selected heavy migrations when needed to reduce timeout risk.
+is_true() {
+  case "${1:-}" in
+    1|t|T|true|TRUE|yes|YES|y|Y|on|ON) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+migration_applied() {
+  local mig_name="$1"
+  local out=""
+  if ! is_true "${SCHEMA_MIGRATIONS_EXISTS:-}"; then
+    echo "0"
+    return 0
+  fi
+  out=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT 1 FROM schema_migrations WHERE filename='${mig_name}' LIMIT 1" 2>/dev/null | tr -d '[:space:]' || true)
+  if [ "${out}" = "1" ]; then
+    echo "1"
   else
-    MIG_033_APPLIED=""
+    echo "0"
   fi
+}
+
+preapply_migration() {
+  local mig_name="$1"
+  local mig_url="$2"
+  local mig_sql="/tmp/${mig_name}"
+  if curl -fsSL "${mig_url}" -o "${mig_sql}" >/dev/null 2>&1; then
+    echo "[boot] pre-applying migration ${mig_name} ..."
+    if PGOPTIONS="-c statement_timeout=0 -c lock_timeout=0" psql "dbname=${DATABASE_DBNAME}" -v ON_ERROR_STOP=1 -f "${mig_sql}" >/dev/null 2>&1; then
+      echo "[boot] pre-apply ${mig_name} done"
+      rm -f "${mig_sql}" || true
+      return 0
+    fi
+    echo "[warn] pre-apply ${mig_name} failed; AutoSetup will continue with built-in migration flow"
+    rm -f "${mig_sql}" || true
+    return 1
+  fi
+  echo "[warn] failed to download migration ${mig_name} from ${mig_url}"
+  return 1
+}
+
+if command -v psql >/dev/null 2>&1 && command -v curl >/dev/null 2>&1; then
+  SCHEMA_MIGRATIONS_EXISTS=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT to_regclass('public.schema_migrations') IS NOT NULL" 2>/dev/null | tr -d '[:space:]' || true)
+  OPS_CORE_EXISTS=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT to_regclass('public.ops_error_logs') IS NOT NULL" 2>/dev/null | tr -d '[:space:]' || true)
+
+  MIG_033_APPLIED="$(migration_applied "033_ops_monitoring_vnext.sql")"
+  MIG_062_APPLIED="$(migration_applied "062_add_scheduler_and_usage_composite_indexes_notx.sql")"
+  MIG_065_APPLIED="$(migration_applied "065_add_search_trgm_indexes.sql")"
 
   if [ "${MIG_033_APPLIED}" != "1" ]; then
-    MIG_033_URL="${MIG_033_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/033_ops_monitoring_vnext.sql}"
-    MIG_033_SQL="/tmp/033_ops_monitoring_vnext.sql"
-    if curl -fsSL "${MIG_033_URL}" -o "${MIG_033_SQL}" >/dev/null 2>&1; then
-      echo "[boot] pre-applying migration 033 to avoid AutoSetup timeout..."
-      if PGOPTIONS="-c statement_timeout=0 -c lock_timeout=0" psql "dbname=${DATABASE_DBNAME}" -v ON_ERROR_STOP=1 -f "${MIG_033_SQL}" >/dev/null 2>&1; then
-        echo "[boot] pre-apply 033 done"
-      else
-        echo "[warn] pre-apply 033 failed; AutoSetup will continue with built-in migration flow"
-      fi
-      rm -f "${MIG_033_SQL}" || true
+    # If ops core tables already exist, avoid re-running destructive 033 pre-apply.
+    if is_true "${OPS_CORE_EXISTS}"; then
+      echo "[boot] skip pre-apply 033: ops schema already present"
     else
-      echo "[warn] failed to download migration 033 from ${MIG_033_URL}"
+      preapply_migration \
+        "033_ops_monitoring_vnext.sql" \
+        "${MIG_033_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/033_ops_monitoring_vnext.sql}" || true
     fi
   fi
+
+  if [ "${MIG_062_APPLIED}" != "1" ]; then
+    preapply_migration \
+      "062_add_scheduler_and_usage_composite_indexes_notx.sql" \
+      "${MIG_062_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/062_add_scheduler_and_usage_composite_indexes_notx.sql}" || true
+  fi
+
+  if [ "${MIG_065_APPLIED}" != "1" ]; then
+    preapply_migration \
+      "065_add_search_trgm_indexes.sql" \
+      "${MIG_065_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/065_add_search_trgm_indexes.sql}" || true
+  fi
 fi
 
 DATABASE_QUERY="sslmode=${DATABASE_SSLMODE}&sslrootcert=${DATABASE_SSLROOTCERT}"