sandcastle-ng

commit 4c3f43a8fdd128de4ee6219f051ae596f54615b9
parent c865af5afe294c983d2abea06f25f0de8a21339c
Author: Florian Dold <florian@dold.me>
Date:   Thu, 30 Oct 2025 13:58:55 +0100

start postgres

Diffstat:
M
scripts/demo/setup-sandcastle.sh
 | 
43
++++++++++++++++++++++++-------------------

1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -427,25 +427,25 @@ EOF
 # Create databases
 #
 
-systemctl start postgresql.service
-
-while true; do
-  pg_isready; ret=$?
-  case "$ret" in
-    0)
-      echo "Postgres is ready" >&2
-      break
-      ;;
-    1|2)
-      echo "pg_isready returned status $ret, waiting" >&2
-      sleep 1
-      ;;
-    3)
-      echo "pg_isready returned status $ret, giving up" >&2
-      exit 3
-      ;;
-  esac
-done
+function wait_pg_ready() {
+  while true; do
+    pg_isready; ret=$?
+    case "$ret" in
+      0)
+        echo "Postgres is ready" >&2
+        break
+        ;;
+      1|2)
+        echo "pg_isready returned status $ret, waiting" >&2
+        sleep 1
+        ;;
+      3)
+        echo "pg_isready returned status $ret, giving up" >&2
+        exit 3
+        ;;
+    esac
+  done
+}
 
 backup_file=/exported/postgres-backup.sql
 if [[ $import_instr = singledump ]]; then
@@ -456,7 +456,12 @@ if [[ $import_instr = singledump ]]; then
   fi
   pg_dropcluster --stop 17 main || true
   pg_createcluster 17 main
+  systemctl start postgresql.service
+  wait_pg_ready
   sudo -u postgres psql postgres -f "$backup_file"
+else
+  systemctl start postgresql.service
+  wait_pg_ready
 fi
 
 # Set up databases.