Skip to content

pgsql: fix support for upper-case hostnames and report exit-reason when failing due to remaining lock file #1552

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
+4 −1
Open

pgsql: fix support for upper-case hostnames and report exit-reason when failing due to remaining lock file #1552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e56d0e1
pgsql: lower-case application_name to avoid issues with upper-case ho…
oalbrigt Sep 11, 2020
5aee799
pgsql: set exit-reason when failing due to remaining PGSQL.lock
oalbrigt Sep 11, 2020
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
5 changes: 4 additions & 1 deletion heartbeat/pgsql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,9 @@ pgsql_real_monitor() {
if ! pgsql_status
then
ocf_log info "PostgreSQL is down"
if [ "$__OCF_ACTION" = "monitor" ] && ! ocf_is_probe && [ -f $PGSQL_LOCK ]; then
ocf_exit_reason "My data may be inconsistent. You have to remove $PGSQL_LOCK file to force start."
fi
return $OCF_NOT_RUNNING
fi

Expand Down Expand Up @@ -1960,7 +1963,7 @@ pgsql_validate_all() {
else
CHECK_XLOG_LOC_SQL="select pg_last_xlog_replay_location(),pg_last_xlog_receive_location()"
fi
CHECK_REPLICATION_STATE_SQL="select application_name,upper(state),upper(sync_state) from pg_stat_replication"
CHECK_REPLICATION_STATE_SQL="select lower(application_name),upper(state),upper(sync_state) from pg_stat_replication"

PGSQL_STATUS_ATTR="${RESOURCE_NAME}-status"
PGSQL_DATA_STATUS_ATTR="${RESOURCE_NAME}-data-status"
Expand Down