Skip to content

Fixed hub install aborting when there is no PostgreSQL backup to preserve #2399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickanderson wants to merge 1 commit into
base: 3.27.x
Choose a base branch
from
Open

Fixed hub install aborting when there is no PostgreSQL backup to preserve #2399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions packaging/common/cfengine-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,15 +434,26 @@ init_postgres_dir()
chown cfpostgres:cfpostgres /var/log/postgresql.log
chmod 600 /var/log/postgresql.log

if ! is_upgrade; then
# Not an upgrade, just use the recommended or default file (see generate_new_postgres_conf())
# Always use the original pg_*.conf files, they define access control to
# PostgreSQL. An unmatched glob expands to itself, so `test -f` is what tells
# us preinstall.sh made no backup to take them from.
preserved_pgconfig=0
if is_upgrade; then
for _pgconf in "$BACKUP_DIR"/data/pg_*.conf; do
test -f "$_pgconf" || continue
cp -a "$_pgconf" "$PREFIX/state/pg/data/"
chown cfpostgres "$PREFIX/state/pg/data/${_pgconf##*/}"
preserved_pgconfig=1
done
test $preserved_pgconfig = 1 ||
cf_console echo "No PostgreSQL configuration backup in $BACKUP_DIR, using freshly generated configuration files."
fi

if [ $preserved_pgconfig = 0 ]; then
# Nothing to preserve, just use the recommended or default file (see generate_new_postgres_conf())
cp -a "$new_pgconfig_file" $PREFIX/state/pg/data/postgresql.conf
chown cfpostgres $PREFIX/state/pg/data/postgresql.conf
else
# Always use the original pg_*.conf files, they define access control to PostgreSQL
cp -a "$BACKUP_DIR"/data/pg_*.conf "$PREFIX/state/pg/data/"
chown cfpostgres "$PREFIX"/state/pg/data/pg_*.conf

# Determine which postgresql.conf file to use and put it in the right place.
if [ -f "$BACKUP_DIR/data/postgresql.conf.modified" ]; then
# User-modified file from the previous old version of CFEngine exists, try to use it.
Expand Down Expand Up @@ -817,7 +828,8 @@ if [ ! -f $PREFIX/state/pg/data/postgresql.conf ]; then
cf_console echo "No existing postgresql.conf, initializing Postgres"
init_postgres_dir "$new_pgconfig_file" "$pgconfig_type"
fi
if is_upgrade && [ -d "$BACKUP_DIR/data" ]; then
# PG_VERSION tells us it is a real data directory and not an empty one moved aside.
if is_upgrade && [ -f "$BACKUP_DIR/data/PG_VERSION" ]; then
cf_console echo "Upgrade and BACKUP_DIR/data is present, proceeding with full database migration."
do_migration "$new_pgconfig_file" "$pgconfig_type"
else
Expand Down
4 changes: 3 additions & 1 deletion packaging/common/cfengine-hub/preinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,9 @@ if migrating_postgres; then
exit 1
fi

if ! diff "$BACKUP_DIR/data/postgresql.conf" "$PREFIX/share/postgresql/postgresql.conf.cfengine" > /dev/null; then
# An empty data directory has no postgresql.conf to compare or preserve.
if [ -f "$BACKUP_DIR/data/postgresql.conf" ] &&
! diff "$BACKUP_DIR/data/postgresql.conf" "$PREFIX/share/postgresql/postgresql.conf.cfengine" > /dev/null; then
# diff exits with 0 if the files are the same
# the postgresql.conf file was modified, we should try to use it after migration
cp -a "$BACKUP_DIR/data/postgresql.conf" "$BACKUP_DIR/data/postgresql.conf.modified"
Expand Down