Skip to content

ENT-14169: Fixed cf-postgres.service race in hub postinstall DB setup #2292

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

Draft
aleksandrychev wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −0
Draft

ENT-14169: Fixed cf-postgres.service race in hub postinstall DB setup #2292

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
18 changes: 18 additions & 0 deletions packaging/common/cfengine-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,18 @@ mkdir -p "$PREFIX/state/pg"
chown root:cfpostgres "$PREFIX/state" "$PREFIX/state/pg"
chmod 0750 "$PREFIX/state" "$PREFIX/state/pg"

# mask cf-postgres.service while we run our own private postmaster
# below; it is Restart=always, so a plain stop gets revived and races us for the
# data dir, removing postmaster.pid and failing the scriptlet. Unmask via trap.
if use_systemd; then
unmask_cf_postgres() {
/bin/systemctl unmask cf-postgres.service >/dev/null 2>&1 || true
}
trap unmask_cf_postgres EXIT
/bin/systemctl stop cf-postgres.service >/dev/null 2>&1 || true
/bin/systemctl mask cf-postgres.service >/dev/null 2>&1 || true
fi

test -z "$BACKUP_DIR" && BACKUP_DIR=$PREFIX/state/pg/backup
if [ ! -f $PREFIX/state/pg/data/postgresql.conf ]; then
new_pgconfig_file=`generate_new_postgres_conf`
Expand Down Expand Up @@ -1105,6 +1117,12 @@ if command -v restorecon >/dev/null; then
restorecon -iR /var/cfengine /opt/cfengine
fi

# unmask cf-postgres.service before the umbrella start below
# brings it back up. Explicit here since the start happens before the EXIT trap.
if use_systemd; then
unmask_cf_postgres
fi

if is_upgrade && [ -f "$PREFIX/UPGRADED_FROM_STATE.txt" ]; then
cf_console restore_cfengine_state "$PREFIX/UPGRADED_FROM_STATE.txt"
rm -f "$PREFIX/UPGRADED_FROM_STATE.txt"
Expand Down
Loading