Skip to content

pgsql: Fixed an issue where tmpdir was not created when rep_mode was set to slave. #2071

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
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −4
Open

pgsql: Fixed an issue where tmpdir was not created when rep_mode was set to slave. #2071

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c3f2cf
pgsql: Fixed an issue where tmpdir was not created when rep_mode was …
yiida-ha Sep 4, 2025
cd8e58f
pgsql: Move the tmpdir creation process to the start action
yiida-ha Sep 17, 2025
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
23 changes: 19 additions & 4 deletions heartbeat/pgsql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,25 @@ user_recovery_conf() {
}

make_recovery_conf() {
local version

version=`cat $OCF_RESKEY_pgdata/PG_VERSION`
if [ "$OCF_RESKEY_rep_mode" = "slave" ]; then
# For slave mode in PostgreSQL 12 and later, create the tmp directory to place recovery.conf.
ocf_version_cmp "$version" "12"
rc=$?
if [ $rc -eq 1 ]||[ $rc -eq 2 ]; then # PosrgreSQL 12 or later.
if ! mkdir -p $OCF_RESKEY_tmpdir || ! chown $OCF_RESKEY_pgdba $OCF_RESKEY_tmpdir || ! chmod 700 $OCF_RESKEY_tmpdir; then
ocf_exit_reason "Can't create directory $OCF_RESKEY_tmpdir or it is not readable by $OCF_RESKEY_pgdba"
return $OCF_ERR_PERM
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can remove the outer if[] here, and and use [ "$OCF_RESKEY_rep_mode" = "slave" ] && return $OCF_ERR_PERM || return $OCF_ERR_GENERIC here instead.

fi
fi
else
if ! mkdir -p $OCF_RESKEY_tmpdir || ! chown $OCF_RESKEY_pgdba $OCF_RESKEY_tmpdir || ! chmod 700 $OCF_RESKEY_tmpdir; then
ocf_exit_reason "Can't create directory $OCF_RESKEY_tmpdir or it is not readable by $OCF_RESKEY_pgdba"
return $OCF_ERR_GENERIC
fi
fi
runasowner "touch $RECOVERY_CONF"
if [ $? -ne 0 ]; then
ocf_exit_reason "Can't create recovery.conf."
Expand Down Expand Up @@ -1977,10 +1996,6 @@ validate_ocf_check_level_10() {
fi
fi
fi
if ! mkdir -p $OCF_RESKEY_tmpdir || ! chown $OCF_RESKEY_pgdba $OCF_RESKEY_tmpdir || ! chmod 700 $OCF_RESKEY_tmpdir; then
ocf_exit_reason "Can't create directory $OCF_RESKEY_tmpdir or it is not readable by $OCF_RESKEY_pgdba"
return $OCF_ERR_PERM
fi
fi

if [ "$OCF_RESKEY_rep_mode" = "slave" ]; then
Expand Down