Skip to content

Commit b4a58fa

Browse files
committed
fix: rollback to working version with fix from divit
1 parent ed3ea78 commit b4a58fa

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -427,13 +427,8 @@ $(cat /etc/postgresql/pg_hba.conf)" > /etc/postgresql/pg_hba.conf
427427
cp "$POSTGRES_CONFIG_PATH" "$TMP_CONFIG"
428428

429429
# Check if max_slot_wal_keep_size exists in the config
430-
if grep -q "max_slot_wal_keep_size" "$TMP_CONFIG"; then
431-
# Find and replace the existing setting
432-
sed -i 's/^\s*max_slot_wal_keep_size\s*=.*$/max_slot_wal_keep_size = -1/' "$TMP_CONFIG"
433-
else
434430
# Add the setting if not found
435-
echo "max_slot_wal_keep_size = -1" >> "$TMP_CONFIG"
436-
fi
431+
echo "max_slot_wal_keep_size = -1" >> "$TMP_CONFIG"
437432

438433
# Remove db_user_namespace if upgrading from PG15
439434
if [[ "$OLD_PGVERSION" =~ ^15.* && "$PGVERSION" =~ ^17.* ]]; then
@@ -479,13 +474,6 @@ EOF
479474
sleep 3
480475
systemctl stop postgresql
481476

482-
# Additional check to ensure postgres is really stopped
483-
if [ -f "${PGDATAOLD}/postmaster.pid" ]; then
484-
echo "PostgreSQL still running, forcing stop..."
485-
pid=$(head -n 1 "${PGDATAOLD}/postmaster.pid")
486-
kill -9 "$pid" || true
487-
rm -f "${PGDATAOLD}/postmaster.pid"
488-
fi
489477
else
490478
CI_stop_postgres
491479
fi

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ postgres_major:
99

1010
# Full version strings for each major version
1111
postgres_release:
12-
postgresorioledb-17: "17.0.1.079-orioledb"
13-
postgres17: "17.4.1.029"
14-
postgres15: "15.8.1.086"
12+
postgresorioledb-17: "17.0.1.079-orioledb-pgup-1"
13+
postgres17: "17.4.1.029-pgup-1"
14+
postgres15: "15.8.1.086-pgup-1"
1515

1616
# Non Postgres Extensions
1717
pgbouncer_release: "1.19.0"

0 commit comments

Comments
 (0)