diff -Nru resource-agents-4.7.0/debian/changelog resource-agents-4.7.0/debian/changelog --- resource-agents-4.7.0/debian/changelog 2022-07-14 11:09:42.000000000 +0000 +++ resource-agents-4.7.0/debian/changelog 2023-05-03 08:44:56.000000000 +0000 @@ -1,3 +1,11 @@ +resource-agents (1:4.7.0-1ubuntu7.2) jammy; urgency=medium + + * d/p/pgsql-heartbeat-postgresql-issue-jammy.patch: walreceiver name + is changed to make the check for running wal receiver process + compatible with PostgreSQL >= 11 (LP: #2013084) + + -- Michal Maloszewski Wed, 03 May 2023 10:44:56 +0200 + resource-agents (1:4.7.0-1ubuntu7.1) jammy; urgency=medium * d/control: breaks/replaces for file reorg (LP: #1981598) diff -Nru resource-agents-4.7.0/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch resource-agents-4.7.0/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch --- resource-agents-4.7.0/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch 1970-01-01 00:00:00.000000000 +0000 +++ resource-agents-4.7.0/debian/patches/pgsql-heartbeat-postgresql-issue-jammy.patch 2023-05-03 08:44:56.000000000 +0000 @@ -0,0 +1,29 @@ +From 214149d28142e4889e27f6637de8a8508c2f4d27 Mon Sep 17 00:00:00 2001 +From: Andreas Ntaflos +Date: Thu, 24 Dec 2020 13:57:18 +0100 +Subject: [PATCH] pgsql: make wal receiver check compatible with PostgreSQL >= + 11 + +In PostgreSQL 11 and later the wal receiver process is named +"walreceiver" instead of "wal receiver process". This change makes the +check for a running wal receiver process compatible with both variants. + +Origin: upstream, https://github.com/ClusterLabs/resource-agents/commit/214149d28142e4889e27f6637de8a8508c2f4d27 +Bug: https://github.com/ClusterLabs/resource-agents/issues/1551 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/resource-agents/+bug/2013084 +Last-Update: 2023-05-03 +--- + heartbeat/pgsql | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/heartbeat/pgsql ++++ b/heartbeat/pgsql +@@ -934,7 +934,7 @@ + local pgsql_real_monitor_status=$1 + + PID=`head -n 1 $PIDFILE` +- receiver_parent_pids=`ps -ef | tr -s " " | grep "[w]al receiver process" | cut -d " " -f 3` ++ receiver_parent_pids=`ps -ef | tr -s " " | grep "[w]al\s*receiver" | cut -d " " -f 3` + + if echo "$receiver_parent_pids" | grep -q -w "$PID" ; then + attrd_updater -n "$PGSQL_WAL_RECEIVER_STATUS_ATTR" -v "normal" -q diff -Nru resource-agents-4.7.0/debian/patches/series resource-agents-4.7.0/debian/patches/series --- resource-agents-4.7.0/debian/patches/series 2022-02-24 14:52:55.000000000 +0000 +++ resource-agents-4.7.0/debian/patches/series 2023-05-03 08:44:56.000000000 +0000 @@ -6,3 +6,4 @@ gitignore.patch reproducible.patch var-run.patch +pgsql-heartbeat-postgresql-issue-jammy.patch