feat: working pg 17 upgrade

Author: samrose

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

@@ -52,7 +52,7 @@ fi
 SERVER_ENCODING=$(run_sql -A -t -c "SHOW server_encoding;")
 
 POSTGRES_CONFIG_PATH="/etc/postgresql/postgresql.conf"
-PGBINOLD="$(pg_config --bindir)"
+PGBINOLD="/usr/lib/postgresql/bin"
 
 PG_UPGRADE_BIN_DIR="/tmp/pg_upgrade_bin/$PGVERSION"
 NIX_INSTALLER_PATH="/tmp/persistent/nix-installer"
@@ -242,10 +242,6 @@ function initiate_upgrade {
     fi
 
     PGDATAOLD=$(cat "$POSTGRES_CONFIG_PATH" | grep data_directory | sed "s/data_directory = '\(.*\)'.*/\1/")
-    # Resolve symlink if it exists
-    if [ -L "$PGDATAOLD" ]; then
-        PGDATAOLD=$(readlink -f "$PGDATAOLD")
-    fi
 
     PGDATANEW="$MOUNT_POINT/pgdata"
 
@@ -259,12 +255,12 @@ function initiate_upgrade {
     if [ -n "$IS_LOCAL_UPGRADE" ]; then
         mkdir -p "$PG_UPGRADE_BIN_DIR"
         mkdir -p /tmp/persistent/
-        # Use NIX_FLAKE_VERSION if set, otherwise use default
-        if [ -n "$NIX_FLAKE_VERSION" ]; then
+	if [ -n "$NIX_FLAKE_VERSION" ]; then
             echo "$NIX_FLAKE_VERSION" > "$PG_UPGRADE_BIN_DIR/nix_flake_version"
         else
             echo "a7189a68ed4ea78c1e73991b5f271043636cf074" > "$PG_UPGRADE_BIN_DIR/nix_flake_version"
         fi
+
         tar -czf "/tmp/persistent/pg_upgrade_bin.tar.gz" -C "/tmp/pg_upgrade_bin" .
         rm -rf /tmp/pg_upgrade_bin/
     fi
@@ -329,7 +325,6 @@ function initiate_upgrade {
     # upgrade job outputs a log in the cwd; needs write permissions
     mkdir -p /tmp/pg_upgrade/
     chown -R postgres:postgres /tmp/pg_upgrade/
-    chmod 0700 /tmp/pg_upgrade/
     cd /tmp/pg_upgrade/
 
     # Fixing erros generated by previous dpkg executions (package upgrades et co)
@@ -415,6 +410,7 @@ function initiate_upgrade {
         fi
     else
         su -c "$PGBINNEW/initdb -L $PGSHARENEW -D $PGDATANEW/ --username=supabase_admin" -s "$SHELL" postgres
+
     fi
 
     # This line avoids the need to supply the supabase_admin password on the old
@@ -427,51 +423,39 @@ $(cat /etc/postgresql/pg_hba.conf)" > /etc/postgresql/pg_hba.conf
         run_sql -c "select pg_reload_conf();"
     fi
 
-    # Build the base upgrade command
+    TMP_CONFIG="/tmp/pg_upgrade/postgresql.conf"
+    cp "$POSTGRES_CONFIG_PATH" "$TMP_CONFIG"
+ 
+    # Check if max_slot_wal_keep_size exists in the config
+    if grep -q "max_slot_wal_keep_size" "$TMP_CONFIG"; then
+        # Find and replace the existing setting
+        sed -i 's/^\s*max_slot_wal_keep_size\s*=.*$/max_slot_wal_keep_size = -1/' "$TMP_CONFIG"
+    else
+       # Add the setting if not found
+       echo "max_slot_wal_keep_size = -1" >> "$TMP_CONFIG"
+    fi
+
+    chown postgres:postgres "$TMP_CONFIG"
+ 
     UPGRADE_COMMAND=$(cat <<EOF
-    ${PGBINNEW}/pg_upgrade \
+    time ${PGBINNEW}/pg_upgrade \
     --old-bindir="${PGBINOLD}" \
     --new-bindir=${PGBINNEW} \
-    --old-datadir="${PGDATAOLD}" \
+    --old-datadir=${PGDATAOLD} \
     --new-datadir=${PGDATANEW} \
     --username=supabase_admin \
-    --jobs="${WORKERS}" -r
+    --jobs="${WORKERS}" -r \
+    --old-options="-c config_file=$TMP_CONFIG" \
+    --old-options="-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES}'" \
+    --new-options="-c data_directory=${PGDATANEW}" \
+    --new-options="-c config_file=$TMP_CONFIG" \
+    --new-options="-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES}'"
 EOF
     )
 
-    # Add common options including config file
-    UPGRADE_COMMAND="$UPGRADE_COMMAND \
-    --old-options=\"-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES}'\" \
-    --old-options=\"-c data_directory=${PGDATAOLD}\" \
-    --new-options=\"-c data_directory=${PGDATANEW}\" \
-    --new-options=\"-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES}'\""
-
-    # Add remaining version-specific options
-    if [[ "$PGVERSION" =~ ^17.* ]]; then
-        # Create temporary config file for old instance
-        TMP_CONFIG="/tmp/pg_upgrade/postgresql.conf"
-        cp "$POSTGRES_CONFIG_PATH" "$TMP_CONFIG"
-        echo "max_slot_wal_keep_size = -1" >> "$TMP_CONFIG"
-        chown postgres:postgres "$TMP_CONFIG"
-        
-        UPGRADE_COMMAND="$UPGRADE_COMMAND \
-    --old-options='-c config_file=$TMP_CONFIG' \
-    --new-options='-c max_slot_wal_keep_size=-1' \
-    --new-options='-c unix_socket_directories=/tmp/pg_upgrade'"
-    else
-        UPGRADE_COMMAND="$UPGRADE_COMMAND \
-    --old-options='-c config_file=${POSTGRES_CONFIG_PATH}'"
-    fi
-
     if [ "$IS_NIX_BASED_SYSTEM" = "true" ]; then
-        # Ensure nix environment is loaded for both old and new instances
-        UPGRADE_COMMAND=". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && PGBINOLD=${PGBINOLD} $UPGRADE_COMMAND"
-    fi
-
-    # Set max_slot_wal_keep_size in environment for PG17 upgrades
-    if [[ "$PGVERSION" =~ ^17.* ]]; then
-        export PGDATA_UPGRADE_MAX_SLOT_WAL_KEEP_SIZE=-1
-    fi
+        UPGRADE_COMMAND=". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && $UPGRADE_COMMAND"
+    fi 
 
     if [[ "$PGVERSION" =~ ^17.* ]]; then
         GRN_PLUGINS_DIR=/var/lib/postgresql/.nix-profile/lib/groonga/plugins LC_ALL=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND --check" -s "$SHELL" postgres
@@ -493,20 +477,14 @@ EOF
         CI_stop_postgres
     fi
 
-    # Create and set permissions on socket directory for PG17 upgrades
-    if [[ "$PGVERSION" =~ ^17.* ]]; then
-        mkdir -p /tmp/pg_upgrade
-        chown postgres:postgres /tmp/pg_upgrade
-        chmod 0700 /tmp/pg_upgrade
-    fi
-
     # Start the old PostgreSQL instance with version-specific options
     if [[ "$PGVERSION" =~ ^17.* ]]; then
         GRN_PLUGINS_DIR=/var/lib/postgresql/.nix-profile/lib/groonga/plugins LC_ALL=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND" -s "$SHELL" postgres
     else
         GRN_PLUGINS_DIR=/var/lib/postgresql/.nix-profile/lib/groonga/plugins LC_ALL=en_US.UTF-8 LC_CTYPE=$SERVER_LC_CTYPE LC_COLLATE=$SERVER_LC_COLLATE LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LOCALE_ARCHIVE=/usr/lib/locale/locale-archive su -pc "$UPGRADE_COMMAND" -s "$SHELL" postgres
     fi
 
+    # copying custom configurations
     echo "11. Copying custom configurations"
     mkdir -p "$MOUNT_POINT/conf"
     cp -R /etc/postgresql-custom/* "$MOUNT_POINT/conf/"