chore: update pg upgrade scripts

Author: pcnc

ansible/files/admin_api_scripts/pg_upgrade_complete.sh

@@ -13,11 +13,10 @@ EXTENSIONS_TO_REENABLE=(
     "pg_graphql"
 )
 
-set -euo pipefail
+set -eEuo pipefail
 
 run_sql() {
-    STATEMENT=$1
-    psql -h localhost -U supabase_admin -d postgres -c "$STATEMENT"
+    psql -h localhost -U supabase_admin -d postgres "$@"
 }
 
 cleanup() {
@@ -30,6 +29,11 @@ cleanup() {
 }
 
 function complete_pg_upgrade {
+    if [ -f /tmp/pg-upgrade-status ]; then
+        echo "Upgrade job already started. Bailing."
+        exit 0
+    fi
+
     echo "running" > /tmp/pg-upgrade-status
 
     mount -a -v
@@ -42,21 +46,19 @@ function complete_pg_upgrade {
     service postgresql start
 
     for EXTENSION in "${EXTENSIONS_TO_REENABLE[@]}"; do
-        run_sql "CREATE EXTENSION IF NOT EXISTS ${EXTENSION} CASCADE;"
+        run_sql -c "CREATE EXTENSION IF NOT EXISTS ${EXTENSION} CASCADE;"
     done
 
+    if [ -d /data/sql ]; then
+        for FILE in /data/sql/*.sql; do
+            run_sql -f $FILE
+        done
+    fi
+
     sleep 5
     service postgresql restart
 
-    if [[ $(systemctl is-active gotrue) == "inactive" ]]; then
-        echo "starting gotrue"
-        systemctl start --no-block gotrue || true
-    fi
-
-    if [[ $(systemctl is-active postgrest) == "inactive" ]]; then
-        echo "starting postgrest"
-        systemctl start --no-block postgrest || true
-    fi
+    start_vacuum_analyze
 
     echo "Upgrade job completed"
 }
@@ -68,5 +70,4 @@ function start_vacuum_analyze {
 
 trap cleanup ERR
 
-complete_pg_upgrade >>/var/log/pg-upgrade-complete.log 2>&1
-start_vacuum_analyze >>/var/log/pg-upgrade-complete.log 2>&1 &
+complete_pg_upgrade >>/var/log/pg-upgrade-complete.log 2>&1 &

ansible/files/admin_api_scripts/pg_upgrade_initiate.sh

@@ -24,30 +24,6 @@ run_sql() {
     psql -h localhost -U supabase_admin -d postgres -c "$STATEMENT"
 }
 
-function shutdown_services {
-    if [[ $(systemctl is-active gotrue) == "active" ]]; then
-        echo "stopping gotrue"
-        systemctl stop gotrue || true
-    fi
-
-    if [[ $(systemctl is-active postgrest) == "active" ]]; then
-        echo "stopping postgrest"
-        systemctl stop postgrest || true
-    fi
-}
-
-function start_services {
-    if [[ $(systemctl is-active gotrue) == "inactive" ]]; then
-        echo "starting gotrue"
-        systemctl start gotrue || true
-    fi
-
-    if [[ $(systemctl is-active postgrest) == "inactive" ]]; then
-        echo "starting postgrest"
-        systemctl start postgrest || true
-    fi
-}
-
 cleanup() {
     UPGRADE_STATUS=${1:-"failed"}
     EXIT_CODE=${?:-0}
@@ -71,8 +47,6 @@ cleanup() {
 
     run_sql "ALTER USER postgres WITH NOSUPERUSER;"
 
-    start_services
-
     umount $MOUNT_POINT
     echo "${UPGRADE_STATUS}" > /tmp/pg-upgrade-status
 
@@ -82,12 +56,14 @@ cleanup() {
 function initiate_upgrade {
     echo "running" > /tmp/pg-upgrade-status
 
-    shutdown_services
-
     # awk NF==3 prints lines with exactly 3 fields, which are the block devices currently not mounted anywhere
     # excluding nvme0 since it is the root disk
     BLOCK_DEVICE=$(lsblk -dprno name,size,mountpoint,type | grep "disk" | grep -v "nvme0" | awk 'NF==3 { print $1; }')
 
+    if [ -x "$(command -v blockdev)" ]; then 
+        blockdev --rereadpt "$BLOCK_DEVICE"
+    fi
+
     mkdir -p "$MOUNT_POINT"
     mount "$BLOCK_DEVICE" "$MOUNT_POINT"
     resize2fs "$BLOCK_DEVICE"
@@ -129,7 +105,9 @@ function initiate_upgrade {
     WORKERS=$(nproc | awk '{ print ($1 == 1 ? 1 : $1 - 1) }')
 
     # upgrade job outputs a log in the cwd; needs write permissions
-    cd /tmp
+    mkdir -p /tmp/pg_upgrade
+    chown -R postgres:postgres /tmp/pg_upgrade
+    cd /tmp/pg_upgrade
 
     UPGRADE_COMMAND=$(cat <<EOF
     time ${PGBINNEW}/pg_upgrade \
@@ -158,8 +136,12 @@ EOF
     su -c "$UPGRADE_COMMAND" -s $SHELL postgres
 
     # copying custom configurations
-    mkdir -p $MOUNT_POINT/conf
-    cp -R /etc/postgresql-custom/* $MOUNT_POINT/conf/
+    mkdir -p "$MOUNT_POINT/conf"
+    cp -R /etc/postgresql-custom/* "$MOUNT_POINT/conf/"
+
+    # copy sql files generated by pg_upgrade
+    mkdir -p "$MOUNT_POINT/sql"
+    cp /tmp/pg_upgrade/*.sql "$MOUNT_POINT/sql/"  || true
 
     cleanup "complete"
 }

ansible/files/admin_api_scripts/pg_upgrade_prepare.sh

@@ -9,16 +9,6 @@
 
 set -euo pipefail
 
-if [[ $(systemctl is-active gotrue) == "active" ]]; then
-    echo "stopping gotrue"
-    systemctl stop gotrue || true
-fi
-
-if [[ $(systemctl is-active postgrest) == "active" ]]; then
-    echo "stopping postgrest"
-    systemctl stop postgrest || true
-fi
-
 systemctl stop postgresql
 
 cp /etc/postgresql-custom/pgsodium_root.key /data/pgsodium_root.key

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.28"
+postgres-version = "15.1.0.29"